diff --git a/.changeset/eight-bees-speak.md b/.changeset/eight-bees-speak.md
new file mode 100644
index 0000000000..9c8ebe428d
--- /dev/null
+++ b/.changeset/eight-bees-speak.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#bugfix head reporter non-zero reporting period
diff --git a/.changeset/swift-pumas-taste.md b/.changeset/swift-pumas-taste.md
new file mode 100644
index 0000000000..eb08662e20
--- /dev/null
+++ b/.changeset/swift-pumas-taste.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal add head report chain_id
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index eae41c622d..ea3f1419e8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -50,6 +50,9 @@ core/services/relay/evm/functions @smartcontractkit/functions
 core/scripts/functions @smartcontractkit/functions
 core/scripts/gateway @smartcontractkit/functions
 
+# Contracts
+/contracts/ @RensR @matYang @RayXpub @elatoskinas
+
 # First we match on project names to catch files like the compilation scripts,
 # gas snapshots and other files not places in the project directories.
 # This could give some false positives, so afterwards we match on the project directories
@@ -76,8 +79,8 @@ core/scripts/gateway @smartcontractkit/functions
 /contracts/src/v0.8/l2ep @chris-de-leon-cll
 /contracts/src/v0.8/llo-feeds @smartcontractkit/mercury-team
 # TODO: mocks folder, folder should be removed and files moved to the correct folders
-/contracts/src/v0.8/operatorforwarder @austinborn
-/contracts/src/v0.8/shared @RensR
+/contracts/src/v0.8/operatorforwarder @smartcontractkit/data-feeds-engineers
+/contracts/src/v0.8/shared @RensR @matYang @RayXpub @elatoskinas
 # TODO: tests folder, folder should be removed and files moved to the correct folders
 # TODO: transmission folder, owner should be found
 /contracts/src/v0.8/vrf @smartcontractkit/vrf-team
diff --git a/.github/actions/detect-solidity-foundry-version/action.yml b/.github/actions/detect-solidity-foundry-version/action.yml
new file mode 100644
index 0000000000..b37f1e2509
--- /dev/null
+++ b/.github/actions/detect-solidity-foundry-version/action.yml
@@ -0,0 +1,26 @@
+name: 'Detect Foundry version in GNUmakefile'
+description: 'Detects Foundry version in GNUmakefile'
+inputs:
+  working-directory:
+    description: 'The GNUmakefile directory'
+    required: false
+    default: 'contracts'
+outputs:
+  foundry-version:
+    description: 'Foundry version found in GNUmakefile'
+    value: ${{ steps.extract-foundry-version.outputs.foundry-version }}
+runs:
+  using: 'composite'
+  steps:
+    - name: Extract Foundry version
+      id: extract-foundry-version
+      shell: bash
+      working-directory: ${{ inputs.working-directory }}
+      run: |
+        foundry_version=$(grep -Eo "foundryup --version [^ ]+" GNUmakefile | awk '{print $3}')
+        if [ -z "$foundry_version" ]; then
+          echo "::error::Foundry version not found in GNUmakefile"
+          exit 1
+        fi
+        echo "Foundry version found: $foundry_version"
+        echo "foundry-version=$foundry_version" >> $GITHUB_OUTPUT
diff --git a/.github/actions/setup-create-base64-config-ccip/action.yml b/.github/actions/setup-create-base64-config-ccip/action.yml
index 88d9fe8078..e741a2dac0 100644
--- a/.github/actions/setup-create-base64-config-ccip/action.yml
+++ b/.github/actions/setup-create-base64-config-ccip/action.yml
@@ -11,62 +11,39 @@ inputs:
     default: "false"
   selectedNetworks:
     description: The networks to run tests against
-  chainlinkImage:
-    description: The chainlink image to use
-    default: "public.ecr.aws/chainlink/chainlink"
   chainlinkVersion:
     description: The git commit sha to use for the image tag
-  upgradeImage:
-    description: The chainlink image to upgrade to
-    default: ""
   upgradeVersion:
-    description: The git commit sha to use for the image tag
-  lokiEndpoint:
-    description: Loki push endpoint
-  lokiTenantId:
-    description: Loki tenant id
-  lokiBasicAuth:
-    description: Loki basic auth
+    description: The git commit sha to use for the image tag    
   logstreamLogTargets:
     description: Where to send logs (e.g. file, loki)
-  grafanaUrl:
-    description: Grafana URL
-  grafanaDashboardUrl:
-    description: Grafana dashboard URL
-  grafanaBearerToken:
-    description: Grafana bearer token
   customEvmNodes:
     description: Custom EVM nodes to use  in key=value format, where key is chain id and value is docker image to use. If they are provided the number of networksSelected must be equal to the number of customEvmNodes
   evmNodeLogLevel:
     description: Log level for the custom EVM nodes
     default: "info"
+outputs:
+  base64_config:
+    description: The base64-encoded config
+    value: ${{ steps.base64_config_override.outputs.base64_config }}
 
 runs:
   using: composite
   steps:
     - name: Prepare Base64 TOML override
       shell: bash
-      id: base64-config-override
+      id: base64_config_override
       env:
         RUN_ID: ${{ inputs.runId }}
         SELECTED_NETWORKS: ${{ inputs.selectedNetworks }}
         EXISTING_NAMESPACE: ${{ inputs.existingNamespace }}
         TEST_LOG_COLLECT: ${{ inputs.testLogCollect }}
-        CHAINLINK_IMAGE: ${{ inputs.chainlinkImage }}
         CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
-        UPGRADE_IMAGE: ${{ inputs.upgradeImage }}
         UPGRADE_VERSION: ${{ inputs.upgradeVersion }}
-        LOKI_ENDPOINT: ${{ inputs.lokiEndpoint }}
-        LOKI_TENANT_ID: ${{ inputs.lokiTenantId }}
-        LOKI_BASIC_AUTH: ${{ inputs.lokiBasicAuth }}
         LOGSTREAM_LOG_TARGETS: ${{ inputs.logstreamLogTargets }}
-        GRAFANA_URL: ${{ inputs.grafanaUrl }}
-        GRAFANA_DASHBOARD_URL: ${{ inputs.grafanaDashboardUrl }}
-        GRAFANA_BEARER_TOKEN: ${{ inputs.grafanaBearerToken }}
         CUSTOM_EVM_NODES: ${{ inputs.customEvmNodes }}
         EVM_NODE_LOG_LEVEL: ${{ inputs.evmNodeLogLevel }}
       run: |
-        echo ::add-mask::$CHAINLINK_IMAGE
         function convert_to_toml_array() {
           local IFS=','
           local input_array=($1)
@@ -133,11 +110,6 @@ runs:
           fi
         fi
 
-        grafana_bearer_token=""
-        if [ -n "$GRAFANA_BEARER_TOKEN" ]; then
-          grafana_bearer_token="bearer_token_secret=\"$GRAFANA_BEARER_TOKEN\""
-        fi
-
         cat << EOF > config.toml
         [CCIP]
         [CCIP.Env]
@@ -147,13 +119,8 @@ runs:
         [CCIP.Env.NewCLCluster]
         [CCIP.Env.NewCLCluster.Common]
         [CCIP.Env.NewCLCluster.Common.ChainlinkImage]
-        image="$CHAINLINK_IMAGE"
         version="$CHAINLINK_VERSION"
 
-        [CCIP.Env.NewCLCluster.Common.ChainlinkUpgradeImage]
-        image="$UPGRADE_IMAGE"
-        version="$UPGRADE_VERSION"
-
         $custom_nodes_toml
 
         [CCIP.Env.Logging]
@@ -163,16 +130,6 @@ runs:
         [CCIP.Env.Logging.LogStream]
         log_targets=$log_targets
 
-        [CCIP.Env.Logging.Loki]
-        tenant_id="$LOKI_TENANT_ID"
-        endpoint="$LOKI_ENDPOINT"
-        basic_auth_secret="$LOKI_BASIC_AUTH"
-
-        [CCIP.Env.Logging.Grafana]
-        base_url="$GRAFANA_URL"
-        dashboard_url="$GRAFANA_DASHBOARD_URL"
-        $grafana_bearer_token
-
         [CCIP.Groups.load]
         TestRunName = '$EXISTING_NAMESPACE'
 
@@ -181,7 +138,14 @@ runs:
 
         EOF
 
-        BASE64_CCIP_SECRETS_CONFIG=$(cat config.toml | base64 -w 0)
-        echo ::add-mask::$BASE64_CCIP_SECRETS_CONFIG
-        echo "BASE64_CCIP_SECRETS_CONFIG=$BASE64_CCIP_SECRETS_CONFIG" >> $GITHUB_ENV
-        echo "TEST_BASE64_CCIP_SECRETS_CONFIG=$BASE64_CCIP_SECRETS_CONFIG" >> $GITHUB_ENV
+        # Check if UPGRADE_VERSION is not empty and append to config.toml
+        if [ -n "$UPGRADE_VERSION" ]; then
+          cat << EOF >> config.toml
+        [CCIP.Env.NewCLCluster.Common.ChainlinkUpgradeImage]
+        version="$UPGRADE_VERSION"
+        EOF
+        fi     
+
+        BASE64_CONFIG=$(cat config.toml | base64 -w 0)
+        echo ::add-mask::$BASE64_CONFIG
+        echo "base64_config=$BASE64_CONFIG" >> $GITHUB_OUTPUT
diff --git a/.github/actions/setup-slither/action.yaml b/.github/actions/setup-slither/action.yaml
new file mode 100644
index 0000000000..b8bef38575
--- /dev/null
+++ b/.github/actions/setup-slither/action.yaml
@@ -0,0 +1,10 @@
+name: Setup Slither
+description: Installs Slither 0.10.3 for contract analysis. Requires Python 3.6 or higher.
+runs:
+  using: composite
+  steps:
+    - name: Install Slither
+      shell: bash
+      run: |
+        python -m pip install --upgrade pip
+        pip install slither-analyzer==0.10.3
diff --git a/.github/actions/setup-solc-select/action.yaml b/.github/actions/setup-solc-select/action.yaml
new file mode 100644
index 0000000000..b74ffae018
--- /dev/null
+++ b/.github/actions/setup-solc-select/action.yaml
@@ -0,0 +1,30 @@
+name: Setup Solc Select
+description: Installs Solc Select, required versions and selects the version to use. Requires Python 3.6 or higher.
+inputs:
+  to_install:
+    description: Comma-separated list of solc versions to install
+    required: true
+  to_use:
+    description: Solc version to use
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Install solc-select and solc
+      shell: bash
+      run: |
+        pip3 install solc-select
+        sudo ln -s /usr/local/bin/solc-select /usr/bin/solc-select
+                
+        IFS=',' read -ra versions <<< "${{ inputs.to_install }}"
+        for version in "${versions[@]}"; do
+          solc-select install $version
+          if [ $? -ne 0 ]; then
+            echo "Failed to install Solc $version"
+            exit 1
+          fi
+        done
+        
+        solc-select install ${{ inputs.to_use }}
+        solc-select use ${{ inputs.to_use }}
diff --git a/.github/actions/validate-artifact-scope/action.yaml b/.github/actions/validate-artifact-scope/action.yaml
new file mode 100644
index 0000000000..7440efc63a
--- /dev/null
+++ b/.github/actions/validate-artifact-scope/action.yaml
@@ -0,0 +1,103 @@
+name: Validate Artifact Scope
+description: Checks there are any modified Solidity files outside of the specified scope. If so, it prints a warning message, but does not fail the workflow.
+inputs:
+  product:
+    description: The product for which the artifacts are being generated
+    required: true
+  sol_files:
+    description: Comma-separated (CSV) or space-separated (shell) list of Solidity files to check
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Transform input array
+      id: transform_input_array
+      shell: bash
+      run: |
+        is_csv_format() {
+          local input="$1"
+          if [[ "$input" =~ "," ]]; then
+            return 0
+          else
+            return 1
+          fi
+        }
+        
+        is_space_separated_string() {
+          local input="$1"
+          if [[ "$input" =~ ^[^[:space:]]+([[:space:]][^[:space:]]+)*$ ]]; then
+            return 0
+          else
+            return 1
+          fi
+        }
+        
+        array="${{ inputs.sol_files }}"
+        
+        if is_csv_format "$array"; then
+          echo "::debug::CSV format detected, nothing to do"
+          echo "sol_files=$array" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+        
+        if is_space_separated_string "$array"; then
+          echo "::debug::Space-separated format detected, converting to CSV"
+          csv_array="${array// /,}"
+          echo "sol_files=$csv_array" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+        
+        echo "::error::Invalid input format for sol_files. Please provide a comma-separated (CSV) or space-separated (shell) list of Solidity files"
+        exit 1
+
+    - name: Check for changes outside of artifact scope
+      shell: bash
+      run: |
+        echo "::debug::All modified contracts:"
+        echo "${{ steps.transform_input_array.outputs.sol_files }}" | tr ',' '\n'
+        if [ "${{ inputs.product }}" = "shared" ]; then
+          excluded_paths_pattern="!/^contracts\/src\/v0\.8\/interfaces/ && !/^contracts\/src\/v0\.8\/${{ inputs.product }}/ && !/^contracts\/src\/v0\.8\/[^\/]+\.sol$/"
+        else
+          excluded_paths_pattern="!/^contracts\/src\/v0\.8\/${{ inputs.product }}/"
+        fi
+        echo "::debug::Excluded paths: $excluded_paths_pattern"
+        unexpected_files=$(echo "${{ steps.transform_input_array.outputs.sol_files }}" | tr ',' '\n' | awk "$excluded_paths_pattern")
+        missing_files=""
+        set -e 
+        set -o pipefail
+        if [[ -n "$unexpected_files" ]]; then
+          products=()
+          productsStr=""
+          IFS=$'\n' read -r -d '' -a files <<< "$unexpected_files" || true
+          echo "Files: ${files[@]}"
+        
+          for file in "${files[@]}"; do
+            missing_files+="$file,"
+        
+            product=$(echo "$file" | awk -F'src/v0.8/' '{if ($2 ~ /\//) print substr($2, 1, index($2, "/")-1); else print "shared"}')
+            if [[ ! " ${products[@]} " =~ " ${product} " ]]; then
+              products+=("$product")
+              productsStr+="$product, "
+            fi
+          done
+          productsStr=${productsStr%, }
+        
+          set +e 
+          set +o pipefail
+        
+          missing_files=$(echo $missing_files | tr ',' '\n')
+        
+          echo "Error: Found modified contracts outside of the expected scope: ${{ inputs.product }}"
+          echo "Files:"
+          echo "$missing_files"
+          echo "Action required: If you want to generate artifacts for other products ($productsStr) run this workflow again with updated configuration"
+        
+          echo "# Warning!" >> $GITHUB_STEP_SUMMARY
+          echo "## Reason: Found modified contracts outside of the expected scope: ${{ inputs.product }}" >> $GITHUB_STEP_SUMMARY
+          echo "### Files:" >> $GITHUB_STEP_SUMMARY
+          echo "$missing_files" >> $GITHUB_STEP_SUMMARY
+          echo "## Action required: If you want to generate artifacts for other products ($productsStr) run this workflow again with updated configuration" >> $GITHUB_STEP_SUMMARY            
+        else
+          echo "No unexpected files found."
+        fi
diff --git a/.github/actions/validate-solidity-artifacts/action.yaml b/.github/actions/validate-solidity-artifacts/action.yaml
new file mode 100644
index 0000000000..5357a87f96
--- /dev/null
+++ b/.github/actions/validate-solidity-artifacts/action.yaml
@@ -0,0 +1,115 @@
+name: Validate Solidity Artifacts
+description: Checks whether Slither reports and UML diagrams were generated for all necessary files. If not, a warning is printed in job summary, but the job is not marked as failed.
+inputs:
+  slither_reports_path:
+    description: Path to the Slither reports directory (without trailing slash)
+    required: true
+  uml_diagrams_path:
+    description: Path to the UML diagrams directory  (without trailing slash)
+    required: true
+  validate_slither_reports:
+    description: Whether Slither reports should be validated
+    required: true
+  validate_uml_diagrams:
+    description: Whether UML diagrams should be validated
+    required: true
+  sol_files:
+    description: Comma-separated (CSV) or space-separated (shell) list of Solidity files to check
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Transform input array
+      id: transform_input_array
+      shell: bash
+      run: |
+        is_csv_format() {
+          local input="$1"
+          if [[ "$input" =~ "," ]]; then
+            return 0
+          else
+            return 1
+          fi
+        }
+        
+        is_space_separated_string() {
+          local input="$1"
+          if [[ "$input" =~ ^[^[:space:]]+([[:space:]][^[:space:]]+)*$ ]]; then
+            return 0
+          else
+            return 1
+          fi
+        }
+        
+        array="${{ inputs.sol_files }}"
+        
+        if is_csv_format "$array"; then
+          echo "::debug::CSV format detected, nothing to do"
+          echo "sol_files=$array" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+        
+        if is_space_separated_string "$array"; then
+          echo "::debug::Space-separated format detected, converting to CSV"
+          csv_array="${array// /,}"
+          echo "sol_files=$csv_array" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+        
+        echo "::error::Invalid input format for sol_files. Please provide a comma-separated (CSV) or space-separated (shell) list of Solidity files"
+        exit 1
+
+    - name: Validate UML diagrams
+      if: ${{ inputs.validate_uml_diagrams == 'true' }}
+      shell: bash
+      run: |
+        echo "Validating UML diagrams"        
+        IFS=',' read -r -a modified_files <<< "${{ steps.transform_input_array.outputs.sol_files }}"
+        missing_svgs=()        
+        for file in "${modified_files[@]}"; do
+          svg_file="$(basename "${file%.sol}").svg"
+          if [ ! -f "${{ inputs.uml_diagrams_path }}/$svg_file" ]; then
+            echo "Error: UML diagram for $file not found"
+            missing_svgs+=("$file")
+          fi
+        done
+        
+        if [ ${#missing_svgs[@]} -gt 0 ]; then
+            echo "Error: Missing UML diagrams for files: ${missing_svgs[@]}"
+            echo "# Warning!" >> $GITHUB_STEP_SUMMARY
+            echo "## Reason: Missing UML diagrams for files:" >> $GITHUB_STEP_SUMMARY
+            for file in "${missing_svgs[@]}"; do
+              echo " $file" >> $GITHUB_STEP_SUMMARY
+            done
+            echo "## Action required: Please try to generate artifacts for them locally or using a different tool" >> $GITHUB_STEP_SUMMARY
+        else 
+            echo "All UML diagrams generated successfully"
+        fi
+
+    - name: Validate Slither reports
+      if: ${{ inputs.validate_slither_reports == 'true' }}
+      shell: bash
+      run: |
+        echo "Validating Slither reports"
+        IFS=',' read -r -a modified_files <<< "${{ steps.transform_input_array.outputs.sol_files }}"
+        missing_reports=()
+        for file in "${modified_files[@]}"; do
+          report_file="$(basename "${file%.sol}")-slither-report.md"            
+          if [ ! -f "${{ inputs.slither_reports_path }}/$report_file" ]; then
+            echo "Error: Slither report for $file not found"
+            missing_reports+=("$file")
+          fi
+        done
+        
+        if [ ${#missing_reports[@]} -gt 0 ]; then
+            echo "Error: Missing Slither reports for files: ${missing_reports[@]}"
+            echo "# Warning!" >> $GITHUB_STEP_SUMMARY
+            echo "## Reason: Missing Slither reports for files:" >> $GITHUB_STEP_SUMMARY
+            for file in "${missing_reports[@]}"; do
+              echo " $file" >> $GITHUB_STEP_SUMMARY
+            done
+            echo "## Action required: Please try to generate artifacts for them locally" >> $GITHUB_STEP_SUMMARY
+        else 
+           echo "All Slither reports generated successfully"
+        fi
diff --git a/.github/workflows/ccip-chaos-tests.yml b/.github/workflows/ccip-chaos-tests.yml
index 6d1aaffb17..da868886f1 100644
--- a/.github/workflows/ccip-chaos-tests.yml
+++ b/.github/workflows/ccip-chaos-tests.yml
@@ -123,23 +123,20 @@ jobs:
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
           chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
       - name: Run Chaos Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
+        env:
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 1h -count=1 -json -test.parallel 11 -run 'TestChaosCCIP' ./chaos 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
           test_download_vendor_packages_command: make gomod
-          cl_repo: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
-          cl_image_tag: ${{ github.sha }}
           artifacts_location: ./integration-tests/chaos/logs
           publish_check_name: CCIP Chaos Test Results
           publish_report_paths: ./tests-chaos-report.xml
@@ -153,6 +150,13 @@ jobs:
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
           cache_key_id: ccip-load-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "true"
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
+
       ## Notify in slack if the job fails
       - name: Notify Slack
         if: failure() && github.event_name != 'workflow_dispatch'
@@ -205,23 +209,20 @@ jobs:
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Prepare Base64 TOML override for CCIP secrests
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
           chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/6vjVx-1V8/ccip-long-running-tests"
       - name: Run Load With Chaos Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
+        env:
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -timeout 2h -count=1 -json -test.parallel 4 -run '^TestLoadCCIPStableWithPodChaosDiffCommitAndExec' ./load 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: make gomod
-          cl_repo: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
-          cl_image_tag: ${{ github.sha }}
           artifacts_location: ./integration-tests/load/logs
           publish_check_name: CCIP Chaos With Load Test Results
           publish_report_paths: ./tests-chaos-with-load-report.xml
@@ -235,6 +236,12 @@ jobs:
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
           cache_key_id: ccip-load-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "true"
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/6vjVx-1V8/ccip-long-running-tests"
       ## Notify in slack if the job fails
       - name: Notify Slack
         if: failure() && github.event_name != 'workflow_dispatch'
diff --git a/.github/workflows/ccip-client-compatibility-tests.yml b/.github/workflows/ccip-client-compatibility-tests.yml
index 42daf280ca..58c05f2f72 100644
--- a/.github/workflows/ccip-client-compatibility-tests.yml
+++ b/.github/workflows/ccip-client-compatibility-tests.yml
@@ -29,7 +29,7 @@ on:
         type: string
 
 env:
-  CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/ccip
+  CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
   INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
   MOD_CACHE_VERSION: 2
 
@@ -492,33 +492,18 @@ jobs:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
           selectedNetworks: ${{ matrix.evm_node.networks }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
           chainlinkVersion: ${{ needs.select-versions.outputs.chainlink_version }}
-          pyroscopeServer: ${{ !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
-          pyroscopeEnvironment: ci-ccip-bidirectional-lane-${{ matrix.evm_node.name }}
-          pyroscopeKey: ${{ secrets.QA_PYROSCOPE_KEY }}
-          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
-          testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
           selectedNetworks: ${{ matrix.evm_node.networks }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
+          testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
           chainlinkVersion: ${{ needs.select-versions.outputs.chainlink_version }}
-          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
           customEvmNodes: ${{ matrix.evm_node.docker_image }}
-          evmNodeLogLevel: "trace"
       - name: Prepare test log name
         run: |
           replace_special_chars() {
@@ -547,12 +532,13 @@ jobs:
           echo "EVM Implementation Networks: ${{ matrix.evm_node.networks }}"
           echo "Test identifier: ${{ matrix.evm_node.name }}"
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
+        env:
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=2 ${{ matrix.evm_node.run }} 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ needs.select-versions.outputs.chainlink_version }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
           artifacts_name:  ${{ env.TEST_LOG_NAME }}
           artifacts_location: |
@@ -568,6 +554,17 @@ jobs:
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_KUBECONFIG: ""
           should_tidy: "false"
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL_CI }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_CHAINLINK_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
+          DEFAULT_PYROSCOPE_SERVER_URL: ${{ !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
+          DEFAULT_PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+          DEFAULT_PYROSCOPE_ENVIRONMENT: ci-ccip-bidirectional-lane-${{ matrix.evm_node.name }}
+          DEFAULT_PYROSCOPE_ENABLED: 'true'
+
       - name: Print failed test summary
         if: always()
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/show-test-summary@1587f59bfd626b668d303abbc90fee41b12397e6 # v2.3.23
diff --git a/.github/workflows/ccip-live-network-tests.yml b/.github/workflows/ccip-live-network-tests.yml
index 29792f77ed..7d908d9718 100644
--- a/.github/workflows/ccip-live-network-tests.yml
+++ b/.github/workflows/ccip-live-network-tests.yml
@@ -17,6 +17,10 @@ on:
         options:
           - 'load'
           - 'smoke'
+      test_secrets_override_key:
+        description: 'Key to run tests with custom test secrets'
+        required: false
+        type: string
 
 # Only run 1 of this workflow at a time per PR
 concurrency:
@@ -25,12 +29,32 @@ concurrency:
 
 env:
   CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
-  CHAINLINK_VERSION: ${{ github.sha}}
-  CHAINLINK_TEST_VERSION: ${{ github.sha}}
+  CHAINLINK_VERSION: ${{ github.sha }}
+  CHAINLINK_TEST_VERSION: ${{ github.sha }}
   ENV_JOB_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-ccip-tests:${{ github.sha }}
   INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
   AWS_ECR_REPO_PUBLIC_REGISTRY: public.ecr.aws
-
+  E2E_TEST_CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+  E2E_TEST_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+  E2E_TEST_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+  E2E_TEST_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+  E2E_TEST_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+  # Default private key test secret loaded from Github Secret as only security team has access to it.
+  # this key secrets.QA_SHARED_803C_KEY has a story behind it. To know more, see CCIP-2875 and SECHD-16575 tickets.
+  E2E_TEST_ETHEREUM_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_ARBITRUM_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_BASE_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_WEMIX_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_AVALANCHE_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_ZKSYNC_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_MODE_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_METIS_ANDROMEDA_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_OPTIMISM_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_KROMA_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_GNOSIS_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_POLYGON_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_BSC_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  
 jobs:
   build-chainlink:
     environment: integration
@@ -124,7 +148,6 @@ jobs:
       TEST_LOG_LEVEL: info
       REF_NAME: ${{ github.head_ref || github.ref_name }}
       ENV_JOB_IMAGE_BASE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-ccip-tests
-      BASE64_NETWORK_CONFIG: ${{ secrets.BASE64_NETWORK_CONFIG }}
 
     steps:
       - name: Collect Metrics
@@ -142,26 +165,21 @@ jobs:
         with:
           ref: ${{ env.REF_NAME }}
       - name: Prepare Base64 TOML override
+        id: set_override_config
         shell: bash
         run: |
-          # this key secrets.QA_SHARED_803C_KEY has a story behind it. To know more, see CCIP-2875 and SECHD-16575 tickets.
-          BASE64_NETWORK_CONFIG=$(echo $BASE64_NETWORK_CONFIG | base64 -w 0 -d | sed -e 's/evm_key/${{ secrets.QA_SHARED_803C_KEY }}/g' | base64 -w 0)
-          echo ::add-mask::$BASE64_NETWORK_CONFIG
-          echo "BASE64_NETWORK_CONFIG=$BASE64_NETWORK_CONFIG" >> "$GITHUB_ENV"
           SLACK_USER=$(jq -r '.inputs.slackMemberID' $GITHUB_EVENT_PATH)
           echo ::add-mask::$SLACK_USER
           echo "SLACK_USER=$SLACK_USER" >> "$GITHUB_ENV"
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             BASE64_CCIP_CONFIG_OVERRIDE=$(jq -r '.inputs.base64_test_input' $GITHUB_EVENT_PATH)
             echo ::add-mask::$BASE64_CCIP_CONFIG_OVERRIDE
-            echo "BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
-            echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
+            echo "base_64_override=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_OUTPUT
           fi
           if [[ "${{ github.event_name }}" == "schedule" ]]; then
             BASE64_CCIP_CONFIG_OVERRIDE=$(base64 -w 0 -i ./integration-tests/ccip-tests/testconfig/override/${{ matrix.config }})
             echo ::add-mask::$BASE64_CCIP_CONFIG_OVERRIDE
-            echo "BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
-            echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
+            echo "base_64_override=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_OUTPUT
             echo "SLACK_USER=${{ secrets.QA_SLACK_USER }}" >> $GITHUB_ENV
           fi
       - name: step summary
@@ -173,19 +191,14 @@ jobs:
           echo "\`${{ env.CHAINLINK_TEST_VERSION }}\`" >> $GITHUB_STEP_SUMMARY
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
-          chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
+          chainlinkVersion: ${{ env.CHAINLINK_VERSION }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/6vjVx-1V8/ccip-long-running-tests"
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5dd916d08c03cb5f9a97304f4f174820421bb946 # v2.3.11
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@94cb11f4bd545607a2f221c6685052b3abee723d # v2.3.32
         env:
           TEST_SUITE: load
           TEST_ARGS: -test.timeout 900h
@@ -194,11 +207,15 @@ jobs:
           RR_CPU: 4
           DETACH_RUNNER: true
           TEST_TRIGGERED_BY: ccip-load-test-ci
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}          
+          E2E_TEST_GRAFANA_DASHBOARD_URL: "/d/6vjVx-1V8/ccip-long-running-tests"
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -v -timeout 70m -count=1 -json -run ^TestLoadCCIPStableRPS$ ./load 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ env.CHAINLINK_VERSION }}
+          # Other default test secrets loaded from dotenv Github Secret.
+          test_secrets_defaults_base64: ${{ secrets.CCIP_DEFAULT_TEST_SECRETS }}
+          test_secrets_override_base64: ${{ secrets[inputs.test_secrets_override_key] }}
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
@@ -210,7 +227,7 @@ jobs:
           cache_key_id: ccip-load-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "true"
           should_cleanup: false
-
+          
   ccip-smoke-test:
     name: CCIP smoke Test
     environment: integration
@@ -231,7 +248,6 @@ jobs:
       TEST_LOG_LEVEL: info
       REF_NAME: ${{ github.head_ref || github.ref_name }}
       ENV_JOB_IMAGE_BASE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-ccip-tests
-      BASE64_NETWORK_CONFIG: ${{ secrets.BASE64_NETWORK_CONFIG }}
 
     steps:
       - name: Collect Metrics
@@ -249,19 +265,16 @@ jobs:
         with:
           ref: ${{ env.REF_NAME }}
       - name: Prepare Base64 TOML override
+        id: set_override_config
         shell: bash
         run: |
-          BASE64_NETWORK_CONFIG=$(echo $BASE64_NETWORK_CONFIG | base64 -w 0 -d | sed -e 's/evm_key/${{ secrets.QA_SHARED_803C_KEY }}/g' | base64 -w 0)
-          echo ::add-mask::$BASE64_NETWORK_CONFIG
-          echo "BASE64_NETWORK_CONFIG=$BASE64_NETWORK_CONFIG" >> "$GITHUB_ENV"
           SLACK_USER=$(jq -r '.inputs.slackMemberID' $GITHUB_EVENT_PATH)
           echo ::add-mask::$SLACK_USER
           echo "SLACK_USER=$SLACK_USER" >> "$GITHUB_ENV"
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             BASE64_CCIP_CONFIG_OVERRIDE=$(jq -r '.inputs.base64_test_input' $GITHUB_EVENT_PATH)
             echo ::add-mask::$BASE64_CCIP_CONFIG_OVERRIDE
-            echo "BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
-            echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
+            echo "base_64_override=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_OUTPUT
           fi
       - name: step summary
         shell: bash
@@ -272,19 +285,14 @@ jobs:
           echo "\`${{ env.CHAINLINK_TEST_VERSION }}\`" >> $GITHUB_STEP_SUMMARY
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
-          chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
+          chainlinkVersion: ${{ env.CHAINLINK_VERSION }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5dd916d08c03cb5f9a97304f4f174820421bb946 # v2.3.11
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@94cb11f4bd545607a2f221c6685052b3abee723d # v2.3.32
         env:
           TEST_SUITE: smoke
           TEST_ARGS: -test.timeout 900h
@@ -293,11 +301,15 @@ jobs:
           RR_MEM: 8Gi
           RR_CPU: 4
           TEST_TRIGGERED_BY: ccip-smoke-test-ci
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}                    
+          E2E_TEST_GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -v -timeout 70m -count=1 -p 30 -json -run ^TestSmokeCCIPForBidirectionalLane$ ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ env.CHAINLINK_VERSION }}
+          # Other default test secrets loaded from dotenv Github Secret.
+          test_secrets_defaults_base64: ${{ secrets.CCIP_DEFAULT_TEST_SECRETS }}
+          test_secrets_override_base64: ${{ secrets[inputs.test_secrets_override_key] }}
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/ccip-load-tests.yml b/.github/workflows/ccip-load-tests.yml
index 9f6a2b0878..633effd86c 100644
--- a/.github/workflows/ccip-load-tests.yml
+++ b/.github/workflows/ccip-load-tests.yml
@@ -10,6 +10,11 @@ on:
       base64_test_input: # base64 encoded toml for test input
         description: 'Base64 encoded toml test input'
         required: false
+      test_secrets_override_key:
+        description: 'Key to run tests with custom test secrets'
+        required: false
+        type: string        
+  pull_request: # DEBUG: Checking run conditions
 
 # Only run 1 of this workflow at a time per PR
 concurrency:
@@ -24,6 +29,26 @@ env:
   INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
   AWS_ECR_REPO_PUBLIC_REGISTRY: public.ecr.aws
   MOD_CACHE_VERSION: 1
+  E2E_TEST_CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+  E2E_TEST_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+  E2E_TEST_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+  E2E_TEST_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+  E2E_TEST_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+  # Default private key test secret loaded from Github Secret as only security team has access to it.
+  # this key secrets.QA_SHARED_803C_KEY has a story behind it. To know more, see CCIP-2875 and SECHD-16575 tickets.
+  E2E_TEST_ETHEREUM_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_ARBITRUM_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_BASE_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_WEMIX_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_AVALANCHE_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_ZKSYNC_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_MODE_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_METIS_ANDROMEDA_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_OPTIMISM_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_KROMA_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_GNOSIS_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_POLYGON_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_BSC_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
 
 jobs:
   build-chainlink:
@@ -52,7 +77,7 @@ jobs:
         with:
           cl_repo: smartcontractkit/chainlink-ccip
           cl_ref: ${{ env.CHAINLINK_VERSION }}
-          push_tag: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink:${{ env.CHAINLINK_VERSION }}
+          push_tag: ${{ env.CHAINLINK_IMAGE }}:${{ env.CHAINLINK_VERSION }}
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
       - name: Collect Metrics
@@ -107,12 +132,10 @@ jobs:
       contents: read
     env:
       CHAINLINK_ENV_USER: ${{ github.actor }}
-      SLACK_USER: ${{ inputs.slackMemberID }}
       SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
       SLACK_CHANNEL: ${{ secrets.QA_SLACK_CHANNEL }}
       TEST_LOG_LEVEL: info
       REF_NAME: ${{ github.head_ref || github.ref_name }}
-      BASE64_NETWORK_CONFIG: ${{ secrets.BASE64_NETWORK_CONFIG }}
     strategy:
       fail-fast: false
       matrix:
@@ -143,20 +166,19 @@ jobs:
         with:
           ref: ${{ env.REF_NAME }}
       - name: Sets env vars
+        id: set_override_config
         shell: bash
         run: |
           # if the matrix.type.config_path is set, use it as the override config
           if [ -n "${{ matrix.type.config_path }}" ]; then
-              echo "BASE64_CCIP_CONFIG_OVERRIDE=$(base64 -w 0 -i ${{ matrix.type.config_path }})" >> $GITHUB_ENV
-              echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$(base64 -w 0 -i ${{ matrix.type.config_path }})" >> $GITHUB_ENV
+              BASE64_CCIP_CONFIG_OVERRIDE=$(base64 -w 0 -i ${{ matrix.type.config_path }})
+              echo ::add-mask::$BASE64_CCIP_CONFIG_OVERRIDE
+              echo "base_64_override=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_OUTPUT
           fi
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             BASE64_CCIP_CONFIG_OVERRIDE=$(jq -r '.inputs.base64_test_input' $GITHUB_EVENT_PATH)
             echo ::add-mask::$BASE64_CCIP_CONFIG_OVERRIDE
-            if [ -n "${BASE64_CCIP_CONFIG_OVERRIDE}" &&  "$BASE64_CCIP_CONFIG_OVERRIDE" != "null"]; then
-              echo "BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
-              echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
-            fi
+            echo "base_64_override=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_OUTPUT
           fi
       - name: step summary
         shell: bash
@@ -167,18 +189,14 @@ jobs:
           echo "\`${{ env.INPUT_CHAINLINK_TEST_VERSION }}\`" >> $GITHUB_STEP_SUMMARY
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
           chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/6vjVx-1V8/ccip-long-running-tests"
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@94cb11f4bd545607a2f221c6685052b3abee723d # v2.3.32
         env:
           TEST_SUITE: load
           TEST_ARGS: -test.timeout 900h
@@ -186,11 +204,16 @@ jobs:
           RR_MEM: 8Gi
           RR_CPU: 4
           TEST_TRIGGERED_BY: ccip-load-test-ci-${{ matrix.type.name }}
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}          
+          E2E_TEST_GRAFANA_DASHBOARD_URL: "/d/6vjVx-1V8/ccip-long-running-tests"
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -v -timeout 70m -count=1 -json -run ${{ matrix.type.run }} ./load 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ env.CHAINLINK_VERSION }}
+          # Load default test secrets
+          test_secrets_defaults_base64: ${{ secrets.CCIP_DEFAULT_TEST_SECRETS }}
+          # Override default test secrets with custom test secrets if provided
+          test_secrets_override_base64: ${{ secrets[inputs.test_secrets_override_key] }}
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/ccip-offchain-upgrade-tests.yml b/.github/workflows/ccip-offchain-upgrade-tests.yml
index 50e02dfc55..3fe3c79cdd 100644
--- a/.github/workflows/ccip-offchain-upgrade-tests.yml
+++ b/.github/workflows/ccip-offchain-upgrade-tests.yml
@@ -19,6 +19,21 @@ env:
   INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
   MOD_CACHE_VERSION: 2
   AWS_ECR_REPO_PUBLIC_REGISTRY: public.ecr.aws
+  # Default private key test secret loaded from Github Secret as only security team has access to it.
+  # this key secrets.QA_SHARED_803C_KEY has a story behind it. To know more, see CCIP-2875 and SECHD-16575 tickets.
+  E2E_TEST_ETHEREUM_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_ARBITRUM_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_BASE_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_WEMIX_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_AVALANCHE_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_ZKSYNC_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_MODE_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_METIS_ANDROMEDA_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_OPTIMISM_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_KROMA_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_GNOSIS_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_POLYGON_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
+  E2E_TEST_BSC_MAINNET_WALLET_KEY: ${{ secrets.QA_SHARED_803C_KEY }}
 
 jobs:
   # Build Test Dependencies
@@ -221,24 +236,19 @@ jobs:
           fi
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          selectedNetworks: SIMULATED_1,SIMULATED_2
-          chainlinkImage: ${{ env.AWS_ECR_REPO_PUBLIC_REGISTRY }}/w0i8p0z9/chainlink-ccip
           chainlinkVersion: ${{ env.RELEASE_TAG }}
-          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
+          selectedNetworks: SIMULATED_1,SIMULATED_2
       - name: Run Tests
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@94cb11f4bd545607a2f221c6685052b3abee723d # v2.3.32
         env:
-          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
-          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
           ENV_JOB_IMAGE: ${{ env.ENV_JOB_IMAGE_BASE }}:${{ github.sha }}
           TEST_SUITE: smoke
           TEST_ARGS: -test.timeout 30m
@@ -246,10 +256,17 @@ jobs:
           DATABASE_URL: postgresql://postgres:node@localhost:5432/chainlink_test?sslmode=disable
           RR_MEM: 8Gi
           RR_CPU: 4
-          BASE64_NETWORK_CONFIG: ${{ secrets.BASE64_NETWORK_CONFIG }}
+          E2E_TEST_CHAINLINK_IMAGE: ${{ env.AWS_ECR_REPO_PUBLIC_REGISTRY }}/w0i8p0z9/chainlink-ccip
+          E2E_TEST_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          E2E_TEST_LOKI_ENDPOINT: ${{ secrets.LOKI_URL_CI }}
+          E2E_TEST_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          E2E_TEST_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          E2E_TEST_GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -timeout 30m -count=1 -json -run ${{ matrix.product.run }} ./smoke 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
+          # Load default test secrets
+          test_secrets_defaults_base64: ${{ secrets.CCIP_DEFAULT_TEST_SECRETS }}
           cl_repo: ${{ env.AWS_ECR_REPO_PUBLIC_REGISTRY }}/w0i8p0z9/chainlink-ccip # releases are published to public registry
           cl_image_tag: ${{ env.RELEASE_TAG }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
@@ -342,34 +359,38 @@ jobs:
           fi
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
-          existingNamespace: ${{ needs.run-test-with-last-release.outputs.existing_namespace }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
           chainlinkVersion: ${{ github.sha }}
-          upgradeImage: ${{ env.CHAINLINK_IMAGE }}
           upgradeVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/6vjVx-1V8/ccip-long-running-tests"
+          existingNamespace: ${{ needs.run-test-with-last-release.outputs.existing_namespace }}
       - name: Run Tests
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@94cb11f4bd545607a2f221c6685052b3abee723d # v2.3.32
         env:
-          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
-          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
           ENV_JOB_IMAGE: ${{ env.ENV_JOB_IMAGE_BASE }}:${{ github.sha }}
           TEST_SUITE: load
           TEST_ARGS: -test.timeout 1h
           DATABASE_URL: postgresql://postgres:node@localhost:5432/chainlink_test?sslmode=disable
           RR_MEM: 8Gi
           RR_CPU: 4
+          E2E_TEST_GRAFANA_DASHBOARD_URL: "/d/6vjVx-1V8/ccip-long-running-tests"
+          E2E_TEST_CHAINLINK_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          E2E_TEST_CHAINLINK_UPGRADE_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          E2E_TEST_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          E2E_TEST_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+          E2E_TEST_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          E2E_TEST_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -timeout 1h -count=1 -json -run ${{ matrix.product.run }} ./load 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
+          # Load default test secrets
+          test_secrets_defaults_base64: ${{ secrets.CCIP_DEFAULT_TEST_SECRETS }}
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
           cl_image_tag: ${{ github.sha }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
@@ -387,4 +408,4 @@ jobs:
           QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
           should_tidy: "false"
           should_cleanup: "true"
-          triggered_by: ${{ needs.run-test-with-last-release.outputs.triggered_by }}
\ No newline at end of file
+          triggered_by: ${{ needs.run-test-with-last-release.outputs.triggered_by }}
diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
index 209c9f9192..ddb89e517b 100644
--- a/.github/workflows/ci-core.yml
+++ b/.github/workflows/ci-core.yml
@@ -92,10 +92,6 @@ jobs:
             id: core_unit
             os: ubuntu22.04-32cores-128GB
             printResults: true
-          - cmd: go_core_ccip_deployment_tests
-            id: core_unit
-            os: ubuntu22.04-32cores-128GB
-            printResults: true
           - cmd: go_core_race_tests
             id: core_race
             # use 64cores for overnight runs only due to massive number of runs from PRs
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index a4d82ab67f..dba8aadec6 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -553,6 +553,7 @@ jobs:
           gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
       - name: Prepare Base64 CCIP TOML secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           pyroscopeServer: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
@@ -560,23 +561,16 @@ jobs:
           pyroscopeKey: ${{ secrets.QA_PYROSCOPE_KEY }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
           selectedNetworks: SIMULATED_1,SIMULATED_2
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
-          chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
+          chainlinkVersion: ${{ inputs.evm-ref || github.sha }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: "http://localhost:8080/primary"
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
-          grafanaBearerToken: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
 
       ## Run this step when changes that require tests to be run are made
       - name: Run Tests
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@aa8eea635029ab8d95abd3c206f56dae1e22e623 # v2.3.28
         env:
-          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
-          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
           DEBUG_RESTY: false
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=${{ matrix.product.nodes }} ${{ steps.build-go-test-command.outputs.run_command }} 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci -singlepackage -hidepassingtests=false -hidepassinglogs
diff --git a/.github/workflows/solidity-foundry-artifacts.yml b/.github/workflows/solidity-foundry-artifacts.yml
new file mode 100644
index 0000000000..50a77e2846
--- /dev/null
+++ b/.github/workflows/solidity-foundry-artifacts.yml
@@ -0,0 +1,372 @@
+name: Solidity Foundry Artifact Generation
+on:
+  workflow_dispatch:
+    inputs:
+      product:
+        type: choice
+        description: 'product for which to generate artifacts; should be the same as Foundry profile'
+        required: true
+        options:
+          - "automation"
+          - "ccip"
+          - "functions"
+          - "keystone"
+          - "l2ep"
+          - "liquiditymanager"
+          - "llo-feeds"
+          - "operatorforwarder"
+          - "shared"
+          - "transmission"
+          - "vrf"
+      base_ref:
+        description: 'commit or tag to be used as base reference, when looking for modified Solidity files'
+        required: true
+
+env:
+  FOUNDRY_PROFILE: ci
+
+jobs:
+  changes:
+    name: Detect changes
+    runs-on: ubuntu-latest
+    outputs:
+      changes: ${{ steps.changes.outputs.sol }}
+      product_changes: ${{ steps.changes-transform.outputs.product_changes }}
+      product_files: ${{ steps.changes-transform.outputs.product_files }}
+      changeset_changes: ${{ steps.changes-dorny.outputs.changeset }}
+      changeset_files: ${{ steps.changes-dorny.outputs.changeset_files }}
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - name: Find modified contracts
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        id: changes
+        with:
+          list-files: 'csv'
+          base: ${{ inputs.base_ref }}
+          predicate-quantifier: every
+          filters: |
+            ignored: &ignored
+              - '!contracts/src/v0.8/**/test/**'
+              - '!contracts/src/v0.8/**/tests/**'
+              - '!contracts/src/v0.8/**/mock/**'
+              - '!contracts/src/v0.8/**/mocks/**'
+              - '!contracts/src/v0.8/**/*.t.sol'
+              - '!contracts/src/v0.8/*.t.sol'
+              - '!contracts/src/v0.8/**/testhelpers/**'
+              - '!contracts/src/v0.8/testhelpers/**'
+              - '!contracts/src/v0.8/vendor/**'
+            other_shared:
+              - modified|added: 'contracts/src/v0.8/(interfaces/**/*.sol|*.sol)'
+              - *ignored
+            sol:
+              - modified|added: 'contracts/src/v0.8/**/*.sol'
+              - *ignored   
+            product: &product
+              - modified|added: 'contracts/src/v0.8/${{ inputs.product }}/**/*.sol'      
+              - *ignored
+            changeset:
+              - modified|added: 'contracts/.changeset/!(README)*.md' 
+
+      # Manual transformation needed, because shared contracts have a different folder structure
+      - name: Transform modified files
+        id: changes-transform
+        shell: bash
+        run: |
+          if [ "${{ inputs.product }}" = "shared" ]; then
+            echo "::debug:: Product is shared, transforming changes"
+            if [[ "${{ steps.changes.outputs.product }}" == "true" && "${{ steps.changes.outputs.other_shared }}" == "true" ]]; then
+              echo "::debug:: Changes were found in 'shared' folder and in 'interfaces' and root folders"
+              echo "product_changes=true" >> $GITHUB_OUTPUT
+              echo "product_files=${{ steps.changes.outputs.product_files }},${{ steps.changes.outputs.other_shared_files }}" >> $GITHUB_OUTPUT
+            elif [[ "${{ steps.changes.outputs.product }}" == "false" && "${{ steps.changes.outputs.other_shared }}" == "true" ]]; then
+              echo "::debug:: Only contracts in' interfaces' and root folders were modified"
+              echo "product_changes=true" >> $GITHUB_OUTPUT
+              echo "product_files=${{ steps.changes.outputs.other_shared_files }}" >> $GITHUB_OUTPUT
+            elif [[ "${{ steps.changes.outputs.product }}" == "true" && "${{ steps.changes.outputs.other_shared }}" == "false" ]]; then
+              echo "::debug:: Only contracts in 'shared' folder were modified"
+              echo "product_changes=true" >> $GITHUB_OUTPUT
+              echo "product_files=${{ steps.changes.outputs.product_files }}" >> $GITHUB_OUTPUT
+            else
+              echo "::debug:: No contracts were modified"
+              echo "product_changes=false" >> $GITHUB_OUTPUT
+              echo "product_files=" >> $GITHUB_OUTPUT
+            fi
+          else
+           echo "product_changes=${{ steps.changes.outputs.product }}" >> $GITHUB_OUTPUT
+           echo "product_files=${{ steps.changes.outputs.product_files }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Check for changes outside of artifact scope
+        uses: ./.github/actions/validate-artifact-scope
+        if: ${{ steps.changes.outputs.sol == 'true' }}
+        with:
+          sol_files: ${{ steps.changes.outputs.sol_files }}
+          product: ${{ inputs.product }}
+
+  gather-basic-info:
+    name: Gather basic info
+    if: ${{ needs.changes.outputs.product_changes == 'true' }}
+    runs-on: ubuntu-22.04
+    needs: [ changes ]
+    outputs:
+      foundry_version: ${{ steps.extract-foundry-version.outputs.foundry-version }}
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          fetch-depth: 0
+
+      - name: Extract Foundry version
+        id: extract-foundry-version
+        uses: ./.github/actions/detect-solidity-foundry-version
+        with:
+          working-directory: contracts
+
+      - name: Copy modified changesets
+        if: ${{ needs.changes.outputs.changeset_changes == 'true' }}
+        run: |
+          mkdir -p contracts/changesets
+          files="${{ needs.changes.outputs.changeset_files }}"
+          IFS=",'
+          for changeset in $files; do
+            echo "::debug:: Copying $changeset"
+            cp $changeset contracts/changesets
+          done
+
+      - name: Generate basic info and modified contracts list
+        shell: bash
+        run: |
+          echo "Commit SHA used to generate artifacts: ${{ github.sha }}" > contracts/commit_sha_base_ref.txt
+          echo "Base reference SHA used to find modified contracts: ${{ inputs.base_ref }}" >> contracts/commit_sha_base_ref.txt     
+          
+          IFS=',' read -r -a modified_files <<< "${{ needs.changes.outputs.product_files }}"
+          echo "# Modified contracts:" > contracts/modified_contracts.md
+          for file in "${modified_files[@]}"; do
+            echo " - [$file](${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}/$file)" >> contracts/modified_contracts.md
+            echo "$file" >> contracts/modified_contracts.txt
+          done
+
+      - name: Upload basic info and modified contracts list
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 2
+        continue-on-error: true
+        with:
+          name: tmp-basic-info
+          path: |
+            contracts/modified_contracts.md
+            contracts/modified_contracts.txt
+            contracts/commit_sha_base_ref.txt
+            contracts/changesets
+          retention-days: 7
+
+  # some of the artifacts can only be generated on product level, and we cannot scope them to single contracts
+  # some product-level modifications might also require shared contracts changes, so if these happened we need to generate artifacts for shared contracts as well
+  coverage-and-book:
+    if: ${{ needs.changes.outputs.product_changes == 'true' }}
+    name: Generate Docs and Code Coverage reports
+    runs-on: ubuntu-22.04
+    needs: [changes, gather-basic-info]
+    steps:
+      - name: Prepare exclusion list
+        id: prepare-exclusion-list
+        run: |
+          cat <<EOF > coverage_exclusions.json
+           ["automation", "functions", "vrf"]
+          EOF
+          coverage_exclusions=$(cat coverage_exclusions.json | jq -c .)
+          echo "coverage_exclusions=$coverage_exclusions" >> $GITHUB_OUTPUT
+
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-nodejs
+
+      - name: Create directories
+        shell: bash
+        run: |
+          mkdir -p contracts/code-coverage  
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
+        with:
+          version: ${{ needs.gather-basic-info.outputs.foundry_version }}
+
+      # required for code coverage report generation
+      - name: Setup LCOV
+        uses: hrishikesh-kadam/setup-lcov@f5da1b26b0dcf5d893077a3c4f29cf78079c841d # v1.0.0
+
+      - name: Run Forge build for product contracts
+        if: ${{ needs.changes.outputs.product_changes == 'true' }}
+        run: |
+          forge --version
+          forge build
+        working-directory: contracts
+        env:
+          FOUNDRY_PROFILE: ${{ inputs.product }}
+
+      - name: Run coverage for product contracts
+        if: ${{ !contains(fromJson(steps.prepare-exclusion-list.outputs.coverage_exclusions), inputs.product) && needs.changes.outputs.product_changes == 'true' }}
+        working-directory: contracts
+        run: forge coverage --report lcov --report-file code-coverage/lcov.info
+        env:
+          FOUNDRY_PROFILE: ${{ inputs.product }}
+
+      - name: Generate Code Coverage HTML report for product contracts
+        if: ${{ !contains(fromJson(steps.prepare-exclusion-list.outputs.coverage_exclusions), inputs.product) && needs.changes.outputs.product_changes == 'true' }}
+        shell: bash
+        working-directory: contracts
+        run: genhtml code-coverage/lcov.info --branch-coverage --output-directory code-coverage
+
+      - name: Run Forge doc for product contracts
+        if: ${{ needs.changes.outputs.product_changes == 'true' }}
+        run: forge doc --build -o docs
+        working-directory: contracts
+        env:
+          FOUNDRY_PROFILE: ${{ inputs.product }}
+
+      - name: Upload Artifacts for product contracts
+        if: ${{ needs.changes.outputs.product_changes == 'true' }}
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 2
+        continue-on-error: true
+        with:
+          name: tmp-${{ inputs.product }}-artifacts
+          path: |
+            contracts/docs
+            contracts/code-coverage/lcov-.info
+            contracts/code-coverage
+          retention-days: 7
+
+  # Generates UML diagrams and Slither reports for modified contracts
+  uml-static-analysis:
+    if: ${{ needs.changes.outputs.product_changes == 'true' }}
+    name: Generate UML and Slither reports for modified contracts
+    runs-on: ubuntu-22.04
+    needs: [changes, gather-basic-info]
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          fetch-depth: 0
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-nodejs
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
+        with:
+          version: ${{ needs.gather-basic-info.outputs.foundry_version }}
+
+      - name: Install Sol2uml
+        run: |
+          npm link sol2uml --only=production
+
+      - name: Set up Python
+        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f #v5.1.1
+        with:
+          python-version: '3.8'
+
+      - name: Install solc-select and solc
+        uses: ./.github/actions/setup-solc-select
+        with:
+          to_install: '0.8.19'
+          to_use: '0.8.19'
+
+      - name: Install Slither
+        uses: ./.github/actions/setup-slither
+
+      - name: Generate UML
+        shell: bash
+        run: |
+          contract_list="${{ needs.changes.outputs.product_files }}"
+          
+          # modify remappings so that solc can find dependencies
+          ./contracts/scripts/ci/modify_remappings.sh contracts contracts/remappings.txt
+          mv remappings_modified.txt remappings.txt
+          
+          ./contracts/scripts/ci/generate_uml.sh "./" "contracts/uml-diagrams" "$contract_list"
+
+      - name: Generate Slither Markdown reports
+        run: |
+          contract_list="${{ needs.changes.outputs.product_files }}"
+          
+          echo "::debug::Processing contracts: $contract_list"
+          ./contracts/scripts/ci/generate_slither_report.sh "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}/" contracts/configs/slither/.slither.config-artifacts.json "." "$contract_list" "contracts/slither-reports" "--solc-remaps @=contracts/node_modules/@"
+
+      - name: Upload UMLs and Slither reports
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 10
+        continue-on-error: true
+        with:
+          name: tmp-contracts-artifacts
+          path: |
+            contracts/uml-diagrams
+            contracts/slither-reports
+          retention-days: 7
+
+      - name: Validate if all Slither run for all contracts
+        uses: ./.github/actions/validate-solidity-artifacts
+        with:
+          validate_slither_reports: 'true'
+          validate_uml_diagrams: 'true'
+          slither_reports_path: 'contracts/slither-reports'
+          uml_diagrams_path: 'contracts/uml-diagrams'
+          sol_files: ${{ needs.changes.outputs.product_files }}
+
+  gather-all-artifacts:
+    name: Gather all artifacts
+    if: ${{ needs.changes.outputs.product_changes == 'true' }}
+    runs-on: ubuntu-latest
+    needs: [coverage-and-book, uml-static-analysis, gather-basic-info, changes]
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        with:
+          path: review_artifacts
+          merge-multiple: true
+
+      - name: Upload all artifacts as single package
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        with:
+          name: review-artifacts-${{ inputs.product }}-${{ github.sha }}
+          path: review_artifacts
+          retention-days: 60
+
+      - name: Remove temporary artifacts
+        uses: geekyeggo/delete-artifact@24928e75e6e6590170563b8ddae9fac674508aa1 # v5.0
+        with:
+          name: tmp-*
+
+      - name: Print Artifact URL in job summary
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          ARTIFACTS=$(gh api -X GET repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts)
+          ARTIFACT_ID=$(echo "$ARTIFACTS" | jq '.artifacts[] | select(.name=="review-artifacts-${{ inputs.product }}-${{ github.sha }}") | .id')
+          echo "Artifact ID: $ARTIFACT_ID"
+          
+          echo "# Solidity Review Artifact Generated" >> $GITHUB_STEP_SUMMARY
+          echo "Base Ref used: **${{ inputs.base_ref }}**" >> $GITHUB_STEP_SUMMARY
+          echo "Commit SHA used: **${{ github.sha }}**" >> $GITHUB_STEP_SUMMARY
+          echo "[Artifact URL](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts/$ARTIFACT_ID)" >> $GITHUB_STEP_SUMMARY
+
+  notify-no-changes:
+    if: ${{ needs.changes.outputs.product_changes == 'false' }}
+    needs: [changes]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Print warning in job summary
+        shell: bash
+        run: |
+          echo "# Solidity Review Artifact NOT Generated" >> $GITHUB_STEP_SUMMARY
+          echo "Base Ref used: **${{ inputs.base_ref }}**" >> $GITHUB_STEP_SUMMARY
+          echo "Commit SHA used: **${{ github.sha }}**" >> $GITHUB_STEP_SUMMARY
+          echo "## Reason: No modified Solidity files found for ${{ inputs.product }}" >> $GITHUB_STEP_SUMMARY
+          echo "* no modified Solidity files found between ${{ inputs.base_ref }} and ${{ github.sha }} commits" >> $GITHUB_STEP_SUMMARY
+          echo "* or they are located outside of ./contracts/src/v0.8 folder" >> $GITHUB_STEP_SUMMARY
+          echo "* or they were limited to test files" >> $GITHUB_STEP_SUMMARY
+          exit 1
diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml
index e43a4c1320..7ba1d9bba2 100644
--- a/.github/workflows/solidity-foundry.yml
+++ b/.github/workflows/solidity-foundry.yml
@@ -3,42 +3,151 @@ on: [pull_request]
 
 env:
   FOUNDRY_PROFILE: ci
-  # Has to match the `make foundry` version in `contracts/GNUmakefile`
-  FOUNDRY_VERSION: nightly-de33b6af53005037b463318d2628b5cfcaf39916
+
+# Making changes:
+# * use the top-level matrix to decide, which checks should run for each product.
+# * when enabling code coverage, remember to adjust the minimum code coverage as it's set to 98.5% by default.
+
+# This pipeline will run product tests only if product-specific contracts were modified or if broad-impact changes were made (e.g. changes to this pipeline, Foundry configuration, etc.)
+# For modified contracts we use a LLM to extract new issues introduced by the changes. For new contracts full report is delivered.
+# Slither has a default configuration, but also supports per-product configuration. If a product-specific configuration is not found, the default one is used.
+# Changes to test files do not trigger static analysis or formatting checks.
 
 jobs:
+  define-matrix:
+    name: Define test matrix
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.define-matrix.outputs.matrix }}
+      foundry-version: ${{ steps.extract-foundry-version.outputs.foundry-version }}
+    steps:
+      - name: Define test matrix
+        id: define-matrix
+        shell: bash
+        run: |
+          cat <<EOF > matrix.json
+          [
+            { "name": "automation", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": false, "run-forge-fmt": false }},
+            { "name": "ccip", "setup": { "run-coverage": true, "min-coverage": 98.5, "run-gas-snapshot": true, "run-forge-fmt": true }},
+            { "name": "functions", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "keystone", "setup": { "run-coverage": true, "min-coverage": 74.1, "run-gas-snapshot": false, "run-forge-fmt": false }},
+            { "name": "l2ep", "setup": { "run-coverage": true, "min-coverage": 65.6, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "liquiditymanager", "setup": { "run-coverage": true, "min-coverage": 46.3, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "llo-feeds", "setup": { "run-coverage": true, "min-coverage": 49.3, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "operatorforwarder", "setup": { "run-coverage": true, "min-coverage": 55.7, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "shared", "setup": { "run-coverage": true, "extra-coverage-params": "--no-match-path='*CallWithExactGas*'", "min-coverage": 32.6, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "transmission", "setup": { "run-coverage": true, "min-coverage": 65.6, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "vrf", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": false, "run-forge-fmt": false }}
+          ]
+          EOF
+          
+          matrix=$(cat matrix.json | jq -c .)
+          echo "matrix=$matrix" >> $GITHUB_OUTPUT
+
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+
+      - name: Extract Foundry version
+        id: extract-foundry-version
+        uses: ./.github/actions/detect-solidity-foundry-version
+        with:
+          working-directory: contracts
+
   changes:
     name: Detect changes
     runs-on: ubuntu-latest
     outputs:
-      changes: ${{ steps.changes.outputs.src }}
+      non_src_changes: ${{ steps.changes.outputs.non_src }}
+      sol_modified_added: ${{ steps.changes.outputs.sol }}
+      sol_modified_added_files: ${{ steps.changes.outputs.sol_files }}
+      sol_mod_only: ${{ steps.changes.outputs.sol_mod_only }}
+      sol_mod_only_files: ${{ steps.changes.outputs.sol_mod_only_files }}
+      not_test_sol_modified: ${{ steps.changes-non-test.outputs.not_test_sol }}
+      not_test_sol_modified_files: ${{ steps.changes-non-test.outputs.not_test_sol_files }}
+      all_changes: ${{ steps.changes.outputs.changes }}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+      - name: Detect changes
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: changes
         with:
+          list-files: 'shell'
           filters: |
-            src:
-              - 'contracts/src/v0.8/**/*'
-              - '.github/workflows/solidity-foundry.yml'
+            non_src:
+              - '.github/workflows/solidity-foundry.yml'            
               - 'contracts/foundry.toml'
               - 'contracts/gas-snapshots/*.gas-snapshot'
+              - 'contracts/package.json'
+            sol:
+              - modified|added: 'contracts/src/v0.8/**/*.sol'
+            sol_mod_only:
+              - modified: 'contracts/src/v0.8/**/!(tests|mocks)/!(*.t).sol'
+            not_test_sol:
+              - modified|added: 'contracts/src/v0.8/**/!(tests|mocks)/!(*.t).sol'
+            automation:
+              - 'contracts/src/v0.8/automation/**/*.sol'
+            ccip:
+              - 'contracts/src/v0.8/ccip/**/*.sol'
+            functions:
+              - 'contracts/src/v0.8/functions/**/*.sol'
+            keystone:
+              - 'contracts/src/v0.8/keystone/**/*.sol'
+            l2ep:
+              - 'contracts/src/v0.8/l2ep/**/*.sol'
+            liquiditymanager:
+              - 'contracts/src/v0.8/liquiditymanager/**/*.sol'
+            llo-feeds:
+              - 'contracts/src/v0.8/llo-feeds/**/*.sol'
+            operatorforwarder:
+              - 'contracts/src/v0.8/operatorforwarder/**/*.sol'
+            vrf:
+              - 'contracts/src/v0.8/vrf/**/*.sol'
+            shared:
+              - 'contracts/src/v0.8/shared/**/*.sol'
+              - 'contracts/src/v0.8/*.sol'
+              - 'contracts/src/v0.8/mocks/**/*.sol'
+              - 'contracts/src/v0.8/tests/**/*.sol'
+              - 'contracts/src/v0.8/vendor/**/*.sol'
+            transmission:
+              - 'contracts/src/v0.8/transmission/**/*.sol'
+
+      - name: Detect non-test changes
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        id: changes-non-test
+        with:
+          list-files: 'shell'
+          # This is a valid input, see https://github.com/dorny/paths-filter/pull/226
+          predicate-quantifier: every
+          filters: |
+            not_test_sol:
+              - modified|added: 'contracts/src/v0.8/**/!(*.t).sol'
+              - '!contracts/src/v0.8/**/test/**'
+              - '!contracts/src/v0.8/**/tests/**'
+              - '!contracts/src/v0.8/**/mock/**'
+              - '!contracts/src/v0.8/**/mocks/**'
+              - '!contracts/src/v0.8/**/*.t.sol'
+              - '!contracts/src/v0.8/*.t.sol'
+              - '!contracts/src/v0.8/**/testhelpers/**'
+              - '!contracts/src/v0.8/testhelpers/**'
+              - '!contracts/src/v0.8/vendor/**'     
 
   tests:
     strategy:
       fail-fast: false
       matrix:
-        product: [automation, functions, keystone, l2ep, llo-feeds, operatorforwarder, shared, vrf, ccip, liquiditymanager]
-    needs: [changes]
-    name: Foundry Tests ${{ matrix.product }}
-    # See https://github.com/foundry-rs/foundry/issues/3827
+        product: ${{fromJson(needs.define-matrix.outputs.matrix)}}
+    needs: [define-matrix, changes]
+    name: Foundry Tests ${{ matrix.product.name }}
     runs-on: ubuntu-22.04
 
     # The if statements for steps after checkout repo is workaround for
     # passing required check for PRs that don't have filtered changes.
     steps:
       - name: Checkout the repo
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           submodules: recursive
@@ -47,57 +156,435 @@ jobs:
       # and not native Foundry. This is to make sure the dependencies
       # stay in sync.
       - name: Setup NodeJS
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         uses: ./.github/actions/setup-nodejs
 
       - name: Install Foundry
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
         with:
-          version: ${{ env.FOUNDRY_VERSION }}
+          version: ${{ needs.define-matrix.outputs.foundry-version }}
 
       - name: Run Forge build
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         run: |
           forge --version
           forge build
         id: build
         working-directory: contracts
         env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
+          FOUNDRY_PROFILE: ${{ matrix.product.name }}
 
       - name: Run Forge tests
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         run: |
           forge test -vvv
         id: test
         working-directory: contracts
         env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
+          FOUNDRY_PROFILE: ${{ matrix.product.name }}
 
       - name: Run Forge snapshot
-        if: ${{ !contains(fromJson('["vrf"]'), matrix.product) && !contains(fromJson('["automation"]'), matrix.product) && !contains(fromJson('["keystone"]'), matrix.product) && needs.changes.outputs.changes == 'true' }}
+        if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true')
+          && matrix.product.setup.run-gas-snapshot }}
         run: |
-          forge snapshot --nmt "test_?Fuzz_\w{1,}?" --check gas-snapshots/${{ matrix.product }}.gas-snapshot
+          forge snapshot --nmt "test_?Fuzz_\w{1,}?" --check gas-snapshots/${{ matrix.product.name }}.gas-snapshot
         id: snapshot
         working-directory: contracts
         env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
+          FOUNDRY_PROFILE: ${{ matrix.product.name }}
+
+      # required for code coverage report generation
+      - name: Setup LCOV
+        if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true')
+          && matrix.product.setup.run-coverage }}
+        uses: hrishikesh-kadam/setup-lcov@f5da1b26b0dcf5d893077a3c4f29cf78079c841d # v1.0.0
+
+      - name: Run coverage for ${{ matrix.product.name }}
+        if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true')
+          && matrix.product.setup.run-coverage }}
+        working-directory: contracts
+        shell: bash
+        run: |
+          if [[ -n "${{ matrix.product.setup.extra-coverage-params }}" ]]; then
+            forge coverage --report lcov ${{ matrix.product.setup.extra-coverage-params }}
+          else
+            forge coverage --report lcov
+          fi
+        env:
+          FOUNDRY_PROFILE: ${{ matrix.product.name }}
+
+      - name: Prune lcov report
+        if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true')
+          && matrix.product.setup.run-coverage }}
+        run: |
+          ./contracts/scripts/lcov_prune ${{ matrix.product.name }} ./contracts/lcov.info ./contracts/lcov.info.pruned
+
+      - name: Report code coverage for ${{ matrix.product.name }}
+        if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true')
+          && matrix.product.setup.run-coverage }}
+        uses: zgosalvez/github-actions-report-lcov@a546f89a65a0cdcd82a92ae8d65e74d450ff3fbc # v4.1.4
+        with:
+          update-comment: false
+          coverage-files: ./contracts/lcov.info.pruned
+          minimum-coverage: ${{ matrix.product.min-coverage }}
+          artifact-name: code-coverage-report-${{ matrix.product.name }}
+          working-directory: ./contracts
 
       - name: Collect Metrics
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
+          || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
+          || needs.changes.outputs.non_src_changes == 'true' }}
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@d9da21a2747016b3e13de58c7d4115a3d5c97935 # v3.0.1
         with:
-          id: solidity-foundry
+          id: ${{ matrix.product.name }}-solidity-foundry
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-          this-job-name: Foundry Tests ${{ matrix.product }}
+          this-job-name: Foundry Tests ${{ matrix.product.name }}
+        continue-on-error: true
+
+  # runs only if non-test contracts were modified; scoped only to modified or added contracts
+  analyze:
+    needs: [ changes, define-matrix ]
+    name: Run static analysis
+    if: needs.changes.outputs.not_test_sol_modified == 'true' && false
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          submodules: recursive
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-nodejs
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
+        with:
+          version: ${{ needs.define-matrix.outputs.foundry-version }}
+
+      - name: Set up Python
+        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f #v5.1.1
+        with:
+          python-version: '3.8'
+
+      - name: Install solc-select and solc
+        uses: ./.github/actions/setup-solc-select
+        with:
+          to_install: '0.8.19'
+          to_use: '0.8.19'
+
+      - name: Install Slither
+        uses: ./.github/actions/setup-slither
+
+      - name: Run Slither
+        shell: bash
+        run: |          
+          # modify remappings so that solc can find dependencies
+          ./contracts/scripts/ci/modify_remappings.sh contracts contracts/remappings.txt
+          mv remappings_modified.txt remappings.txt
+          
+          # without it Slither sometimes fails to use remappings correctly
+          cp contracts/foundry.toml foundry.toml              
+
+          FILES="${{ needs.changes.outputs.not_test_sol_modified_files }}"            
+          
+          for FILE in $FILES; do
+            PRODUCT=$(echo "$FILE" | awk -F'src/[^/]*/' '{print $2}' | cut -d'/' -f1)
+            echo "::debug::Running Slither for $FILE in $PRODUCT"
+            SLITHER_CONFIG="contracts/configs/slither/.slither.config-$PRODUCT-pr.json"
+            if [[ ! -f $SLITHER_CONFIG ]]; then
+              echo "::debug::No Slither config found for $PRODUCT, using default"
+              SLITHER_CONFIG="contracts/configs/slither/.slither.config-default-pr.json"
+            fi
+            ./contracts/scripts/ci/generate_slither_report.sh "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}/" "$SLITHER_CONFIG" "." "$FILE" "contracts/slither-reports-current" "--solc-remaps @=contracts/node_modules/@"
+          done
+
+      # all the actions below, up to printing results, run only if any existing contracts were modified
+      # in that case we extract new issues introduced by the changes by using an LLM model
+      - name: Upload Slither results for current branch
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 2
+        continue-on-error: true
+        with:
+          name: slither-reports-current-${{ github.sha }}
+          path: contracts/slither-reports-current
+          retention-days: 7
+
+      # we need to upload scripts and configuration in case base_ref doesn't have the scripts, or they are in different version
+      - name: Upload Slither scripts
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 2
+        continue-on-error: true
+        with:
+          name: tmp-slither-scripts-${{ github.sha }}
+          path: contracts/scripts/ci
+          retention-days: 7
+
+      - name: Upload configs
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 2
+        continue-on-error: true
+        with:
+          name: tmp-configs-${{ github.sha }}
+          path: contracts/configs
+          retention-days: 7
+
+      - name: Checkout the repo
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          ref: ${{ github.base_ref }}
+
+      - name: Download Slither scripts
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        with:
+          name: tmp-slither-scripts-${{ github.sha }}
+          path: contracts/scripts/ci
+
+      - name: Download configs
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        with:
+          name: tmp-configs-${{ github.sha }}
+          path: contracts/configs
+
+      # since we have just checked out the repository again, we lose NPM dependencies installs previously, we need to install them again to compile contracts
+      - name: Setup NodeJS
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        uses: ./.github/actions/setup-nodejs
+
+      - name: Run Slither for base reference
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        shell: bash
+        run: |
+          # we need to set file permission again since they are lost during download
+          for file in contracts/scripts/ci/*.sh; do
+            chmod +x "$file"
+          done
+          
+          # modify remappings so that solc can find dependencies
+          ./contracts/scripts/ci/modify_remappings.sh contracts contracts/remappings.txt
+          mv remappings_modified.txt remappings.txt
+          
+          # without it Slither sometimes fails to use remappings correctly
+          cp contracts/foundry.toml foundry.toml
+          
+          FILES="${{ needs.changes.outputs.sol_mod_only_files }}"
+          
+          for FILE in $FILES; do
+            PRODUCT=$(echo "$FILE" | awk -F'src/[^/]*/' '{print $2}' | cut -d'/' -f1)
+            echo "::debug::Running Slither for $FILE in $PRODUCT"
+            SLITHER_CONFIG="contracts/configs/slither/.slither.config-$PRODUCT-pr.json"
+            if [[ ! -f $SLITHER_CONFIG ]]; then
+              echo "::debug::No Slither config found for $PRODUCT, using default"
+              SLITHER_CONFIG="contracts/configs/slither/.slither.config-default-pr.json"
+            fi
+            ./contracts/scripts/ci/generate_slither_report.sh "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.sha }}/" "$SLITHER_CONFIG" "." "$FILE" "contracts/slither-reports-base-ref" "--solc-remaps @=contracts/node_modules/@"
+          done          
+
+      - name: Upload Slither report
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 10
+        continue-on-error: true
+        with:
+          name: slither-reports-base-${{ github.sha }}
+          path: |
+            contracts/slither-reports-base-ref
+          retention-days: 7
+
+      - name: Download Slither results for current branch
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        with:
+          name: slither-reports-current-${{ github.sha }}
+          path: contracts/slither-reports-current
+
+      - name: Generate diff of Slither reports for modified files
+        if: needs.changes.outputs.sol_mod_only == 'true'
+        env:
+          OPEN_API_KEY: ${{ secrets.OPEN_AI_SLITHER_API_KEY }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          for base_report in contracts/slither-reports-base-ref/*.md; do
+            filename=$(basename "$base_report")
+            current_report="contracts/slither-reports-current/$filename"
+            new_issues_report="contracts/slither-reports-current/${filename%.md}_new_issues.md"
+            if [ -f "$current_report" ]; then
+              if ./contracts/scripts/ci/find_slither_report_diff.sh "$base_report" "$current_report" "$new_issues_report" "contracts/scripts/ci/prompt-difference.md" "contracts/scripts/ci/prompt-validation.md"; then          
+                if [[ -s $new_issues_report ]]; then    
+                  awk 'NR==2{print "*This new issues report has been automatically generated by LLM model using two Slither reports. One based on `${{ github.base_ref}}` and another on `${{ github.sha }}` commits.*"}1' $new_issues_report > tmp.md && mv tmp.md $new_issues_report                                  
+                  echo "Replacing full Slither report with diff for $current_report"            
+                  rm $current_report && mv $new_issues_report $current_report
+                else 
+                  echo "No difference detected between $base_report and $current_report reports. Won't include any of them."
+                  rm $current_report
+                fi
+              else
+                echo "::warning::Failed to generate a diff report with new issues for $base_report using an LLM model, will use full report."
+              fi
+          
+            else
+              echo "::warning::Failed to find current commit's equivalent of $base_report (file $current_report doesn't exist, but should have been generated). Please check Slither logs."
+            fi
+          done
+
+      # actions that execute only if any existing contracts were modified end here
+      - name: Print Slither summary
+        shell: bash
+        run: |
+          echo "# Static analysis results " >> $GITHUB_STEP_SUMMARY
+          for file in "contracts/slither-reports-current"/*.md; do
+            if [ -e "$file" ]; then
+              cat "$file" >> $GITHUB_STEP_SUMMARY
+            fi
+          done
+
+      - name: Validate if all Slither run for all contracts
+        uses: ./.github/actions/validate-solidity-artifacts
+        with:
+          validate_slither_reports: 'true'
+          slither_reports_path: 'contracts/slither-reports-current'
+          sol_files: ${{ needs.changes.outputs.not_test_sol_modified_files }}
+
+      - name: Upload Slither reports
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        timeout-minutes: 10
+        continue-on-error: true
+        with:
+          name: slither-reports-${{ github.sha }}
+          path: |
+            contracts/slither-reports-current
+          retention-days: 7
+
+      - name: Find Slither comment in the PR
+        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.0.0
+        id: find-comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: 'Static analysis results'
+
+      - name: Extract job summary URL
+        id: job-summary-url
+        uses: pl-strflt/job-summary-url-action@df2d22c5351f73e0a187d20879854b8d98e6e001 # v1.0.0
+        with:
+          job: 'Run static analysis'
+
+      - name: Build Slither reports artifacts URL
+        id: build-slither-artifact-url
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          ARTIFACTS=$(gh api -X GET repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts)
+          ARTIFACT_ID=$(echo "$ARTIFACTS" | jq '.artifacts[] | select(.name=="slither-reports-${{ github.sha }}") | .id')
+          echo "Artifact ID: $ARTIFACT_ID"
+          
+          slither_artifact_url="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts/$ARTIFACT_ID"
+          echo "slither_artifact_url=$slither_artifact_url" >> $GITHUB_OUTPUT     
+
+      - name: Create or update Slither comment in the PR
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        with:
+          comment-id: ${{ steps.find-comment.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ## Static analysis results are available
+            Hey @${{ github.event.push && github.event.push.pusher && github.event.push.pusher.username || github.actor }}, you can view Slither reports in the job summary [here](${{ steps.job-summary-url.outputs.job_summary_url }}) or download them as artifact [here](${{ steps.build-slither-artifact-url.outputs.slither_artifact_url }}).
+            
+            Please check them before merging and make sure you have addressed all issues.
+          edit-mode: replace
+
+      - name: Remove temp artifacts
+        uses: geekyeggo/delete-artifact@24928e75e6e6590170563b8ddae9fac674508aa1 # v5.0
+        with:
+          name: tmp-*
+
+      - name: Collect Metrics
+        id: collect-gha-metrics
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
+        with:
+          id: solidity-foundry-slither
+          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
+          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          this-job-name: Run static analysis
+        continue-on-error: true
+
+  solidity-forge-fmt:
+    name: Forge fmt ${{ matrix.product.name }}
+    if: ${{ needs.changes.outputs.non_src_changes == 'true' || needs.changes.outputs.not_test_sol_modified == 'true' }}
+    needs: [define-matrix, changes]
+    strategy:
+      fail-fast: false
+      matrix:
+        product: ${{fromJson(needs.define-matrix.outputs.matrix)}}
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout the repo
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) && matrix.product.setup.run-forge-fmt }}
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          submodules: recursive
+
+      - name: Setup NodeJS
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) && matrix.product.setup.run-forge-fmt }}
+        uses: ./.github/actions/setup-nodejs
+
+      - name: Install Foundry
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) && matrix.product.setup.run-forge-fmt }}
+        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
+        with:
+          version: ${{ needs.define-matrix.outputs.foundry-version }}
+
+      - name: Run Forge fmt
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) && matrix.product.setup.run-forge-fmt }}
+        run: forge fmt --check
+        id: fmt
+        working-directory: contracts
+        env:
+          FOUNDRY_PROFILE: ${{ matrix.product.name }}
+
+      - name: Collect Metrics
+        if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) && matrix.product.setup.run-forge-fmt }}
+        id: collect-gha-metrics
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
+        with:
+          id: solidity-forge-fmt-${{ matrix.product.name }}
+          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
+          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          this-job-name: Forge fmt ${{ matrix.product.name }}
         continue-on-error: true
 
   coverage:
-    needs: [changes]
+    needs: [define-matrix, changes]
     name: Coverage
     runs-on: ubuntu-latest
     env:
@@ -105,7 +592,7 @@ jobs:
 
     steps:
       - name: Collect Metrics
-        if: ${{ needs.changes.outputs.changes == 'true' }}
+        if: ${{ needs.changes.outputs.non_src_changes == 'true' || needs.changes.outputs.sol_modified_added == 'true' }}
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
@@ -127,13 +614,13 @@ jobs:
         uses: ./.github/actions/setup-nodejs
 
       - name: Install Foundry
-        if: needs.changes.outputs.changes == 'true'
+        if: ${{ needs.changes.outputs.non_src_changes == 'true' || needs.changes.outputs.sol_modified_added == 'true' }}
         uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
         with:
-          version: ${{ env.FOUNDRY_VERSION }}
+          version: ${{ needs.define-matrix.outputs.foundry-version }}
 
       - name: Run Forge build
-        if: ${{ needs.changes.outputs.changes == 'true' }}
+        if: ${{ needs.changes.outputs.non_src_changes == 'true' || needs.changes.outputs.sol_modified_added == 'true' }}
         working-directory: contracts
         run: |
           forge --version
@@ -141,75 +628,23 @@ jobs:
         id: build
 
       - name: Run coverage
-        if: ${{ needs.changes.outputs.changes == 'true' }}
+        if: ${{ needs.changes.outputs.non_src_changes == 'true' || needs.changes.outputs.sol_modified_added == 'true' }}
         working-directory: contracts
         run: forge coverage --report lcov
 
       - name: Prune report
-        if: ${{ needs.changes.outputs.changes == 'true' }}
+        if: ${{ needs.changes.outputs.non_src_changes == 'true' || needs.changes.outputs.sol_modified_added == 'true' }}
         run: |
           sudo apt-get install lcov
           ./tools/ci/ccip_lcov_prune ./contracts/lcov.info ./lcov.info.pruned
 
       - name: Report code coverage
-        if: ${{ needs.changes.outputs.changes == 'true' }}
+        if: ${{ needs.changes.outputs.non_src_changes == 'true' || needs.changes.outputs.sol_modified_added == 'true' }}
         uses: zgosalvez/github-actions-report-lcov@a546f89a65a0cdcd82a92ae8d65e74d450ff3fbc # v4.1.4
         with:
           update-comment: true
           coverage-files: lcov.info.pruned
-          minimum-coverage: 98.5
+          minimum-coverage: 97.6
           artifact-name: code-coverage-report
           working-directory: ./contracts
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-  fmt:
-    strategy:
-      fail-fast: false
-      matrix:
-        product: [ ccip ]
-    needs: [ changes ]
-    name: Forge fmt ${{ matrix.product }}
-    # See https://github.com/foundry-rs/foundry/issues/3827
-    runs-on: ubuntu-22.04
-
-    # The if statements for steps after checkout repo is workaround for
-    # passing required check for PRs that don't have filtered changes.
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-        with:
-          submodules: recursive
-
-      # Only needed because we use the NPM versions of packages
-      # and not native Foundry. This is to make sure the dependencies
-      # stay in sync.
-      - name: Setup NodeJS
-        if: needs.changes.outputs.changes == 'true'
-        uses: ./.github/actions/setup-nodejs
-
-      - name: Install Foundry
-        if: needs.changes.outputs.changes == 'true'
-        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
-        with:
-          version: ${{ env.FOUNDRY_VERSION }}
-
-      - name: Run Forge fmt
-        if: needs.changes.outputs.changes == 'true'
-        run: |
-          forge fmt --check
-        id: fmt
-        working-directory: contracts
-        env:
-          FOUNDRY_PROFILE: ${{ matrix.product }}
-
-      - name: Collect Metrics
-        if: needs.changes.outputs.changes == 'true'
-        id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
-        with:
-          id: ccip-solidity-foundry-fmt
-          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
-          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
-          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-          this-job-name: Foundry Tests ${{ matrix.product }}
-        continue-on-error: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/solidity-hardhat.yml b/.github/workflows/solidity-hardhat.yml
index 42d47d519e..4fb43ee962 100644
--- a/.github/workflows/solidity-hardhat.yml
+++ b/.github/workflows/solidity-hardhat.yml
@@ -1,70 +1,41 @@
-#name: Solidity-Hardhat
-#
-#on:
-#  merge_group:
-#  push:
-#
-#env:
-#  NODE_OPTIONS: --max_old_space_size=8192
-#
-#defaults:
-#  run:
-#    shell: bash
-#
-#jobs:
-#  changes:
-#    name: Detect changes
-#    runs-on: ubuntu-latest
-#    outputs:
-#      changes: ${{ steps.changes.outputs.src }}
-#    steps:
-#      - name: Checkout the repo
-#        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-#      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-#        id: changes
-#        with:
-#          filters: |
-#            src:
-#              - 'contracts/src/!(v0.8/(llo-feeds|keystone|ccip|liquiditymanager|functions|transmission)/**)/**/*'
-#              - 'contracts/test/**/*'
-#              - 'contracts/package.json'
-#              - 'contracts/pnpm-lock.yaml'
-#              - 'contracts/hardhat.config.ts'
-#              - 'contracts/ci.json'
-#              - '.github/workflows/solidity-hardhat.yml'
-#
-#  split-tests:
-#    name: Split Solidity Tests
-#    runs-on: ubuntu-latest
-#    outputs:
-#      splits: ${{ steps.split.outputs.splits }}
-#    steps:
-#      - name: Checkout the repo
-#        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-#      - name: Generate splits
-#        id: split
-#        uses: ./.github/actions/split-tests
-#        with:
-#          config: ./contracts/ci.json
-#      - name: Collect Metrics
-#        id: collect-gha-metrics
-#        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
-#        with:
-#          id: solidity-split-tests
-#          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
-#          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
-#          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-#          this-job-name: Split Solidity Tests
-#        continue-on-error: true
-#
-#  solidity-splits:
-#    needs: [changes, split-tests]
+name: Solidity-Hardhat
+
+on:
+  merge_group:
+  push:
+
+env:
+  NODE_OPTIONS: --max_old_space_size=8192
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  changes:
+    name: Detect changes
+    runs-on: ubuntu-latest
+    outputs:
+      changes: ${{ steps.changes.outputs.src }}
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        id: changes
+        with:
+          filters: |
+            src:
+              - 'contracts/src/!(v0.8/(ccip|functions|keystone|l2ep|liquiditymanager|llo-feeds|transmission|vrf)/**)/**/*'
+              - 'contracts/test/**/*'
+              - 'contracts/package.json'
+              - 'contracts/pnpm-lock.yaml'
+              - 'contracts/hardhat.config.ts'
+              - '.github/workflows/solidity-hardhat.yml'
+
+#  hardhat-test:
+#    needs: [changes]
 #    if: needs.changes.outputs.changes == 'true'
-#    name: Solidity ${{ matrix.split.id }} ${{ fromJSON('["(skipped)", ""]')[needs.changes.outputs.changes == 'true'] }}
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        split: ${{ fromJson(needs.split-tests.outputs.splits) }}
+#    name: Solidity ${{ fromJSON('["(skipped)", ""]')[needs.changes.outputs.changes == 'true'] }}
 #    runs-on: ubuntu-latest
 #    steps:
 #      - name: Checkout the repo
@@ -76,23 +47,20 @@
 #        with:
 #          namespace: coverage
 #      - name: Run tests
-#        env:
-#          SPLIT: ${{ matrix.split.tests }}
 #        working-directory: contracts
-#        run: pnpm test -- $SPLIT
+#        run: pnpm test
 #      - name: Collect Metrics
 #        id: collect-gha-metrics
-#        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
+#        uses: smartcontractkit/push-gha-metrics-action@d9da21a2747016b3e13de58c7d4115a3d5c97935 # v3.0.1
 #        with:
-#          id: solidity-splits
+#          id: hardhat-test
 #          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
 #          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
 #          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-#          this-job-name: Solidity ${{ matrix.split.id }}
 #        continue-on-error: true
 #
 #  solidity:
-#    needs: [changes, solidity-splits]
+#    needs: [changes, hardhat-test]
 #    name: Solidity
 #    runs-on: ubuntu-latest
 #    if: always()
@@ -109,7 +77,7 @@
 #      - name: Collect Metrics
 #        if: always()
 #        id: collect-gha-metrics
-#        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
+#        uses: smartcontractkit/push-gha-metrics-action@d9da21a2747016b3e13de58c7d4115a3d5c97935 # v3.0.1
 #        with:
 #          id: solidity-tests
 #          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
diff --git a/.mockery.yaml b/.mockery.yaml
index 64217a04be..6e56f27795 100644
--- a/.mockery.yaml
+++ b/.mockery.yaml
@@ -371,13 +371,13 @@ packages:
       outpkg: mock_contracts
     interfaces:
       CommitStoreInterface:
-  github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry:
+  github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter:
     config:
       dir: core/gethwrappers/ccip/mocks/
-      filename: price_registry_interface.go
+      filename: fee_quoter_interface.go
       outpkg: mock_contracts
     interfaces:
-      PriceRegistryInterface: 
+      FeeQuoterInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/link_token_interface:
     config:
       dir: core/gethwrappers/ccip/mocks/
@@ -476,10 +476,6 @@ packages:
       outpkg: mock_optimism_dispute_game_factory
     interfaces:
       OptimismDisputeGameFactoryInterface: 
-  github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types:
-    interfaces:
-      CCIPOracle:
-      OracleCreator:
   github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache:
     config:
       filename: chain_health_mock.go
@@ -499,6 +495,9 @@ packages:
       PriceRegistryReader:
         config:
           filename: price_registry_reader_mock.go
+      FeeEstimatorConfigReader:
+        config:
+          filename: fee_estimator_config_mock.go
       TokenPoolReader:
         config:
           filename: token_pool_reader_mock.go
diff --git a/contracts/.changeset/few-camels-tan.md b/contracts/.changeset/few-camels-tan.md
new file mode 100644
index 0000000000..ca2574171d
--- /dev/null
+++ b/contracts/.changeset/few-camels-tan.md
@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+bump dependencies
diff --git a/contracts/.changeset/itchy-deers-deny.md b/contracts/.changeset/itchy-deers-deny.md
new file mode 100644
index 0000000000..888d58ce31
--- /dev/null
+++ b/contracts/.changeset/itchy-deers-deny.md
@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": patch
+---
+
+More comprehensive & product-scoped Solidity Foundry pipeline
diff --git a/contracts/.solhintignore b/contracts/.solhintignore
index bad1935442..446f91f84f 100644
--- a/contracts/.solhintignore
+++ b/contracts/.solhintignore
@@ -41,3 +41,7 @@
 # Always ignore vendor
 ./src/v0.8/vendor
 ./node_modules/
+
+# Ignore RMN contracts temporarily
+./src/v0.8/ccip/RMNRemote.sol
+./src/v0.8/ccip/RMNHome.sol
\ No newline at end of file
diff --git a/contracts/GNUmakefile b/contracts/GNUmakefile
index 3da2d5f205..862d75a432 100644
--- a/contracts/GNUmakefile
+++ b/contracts/GNUmakefile
@@ -43,7 +43,7 @@ mockery: $(mockery) ## Install mockery.
 
 .PHONY: foundry
 foundry: ## Install foundry.
-	foundryup --version nightly-de33b6af53005037b463318d2628b5cfcaf39916
+	foundryup --version nightly-515a4cc8aba1627a717a1057ff4f09c8cd3bf51f
 
 .PHONY: foundry-refresh
 foundry-refresh: foundry
diff --git a/contracts/configs/slither/.slither.config-artifacts.json b/contracts/configs/slither/.slither.config-artifacts.json
new file mode 100644
index 0000000000..75071341f5
--- /dev/null
+++ b/contracts/configs/slither/.slither.config-artifacts.json
@@ -0,0 +1,3 @@
+{
+  "filter_paths": "(openzeppelin|mocks/|test/|tests/|testhelpers)"
+}
diff --git a/contracts/configs/slither/.slither.config-ccip-pr.json b/contracts/configs/slither/.slither.config-ccip-pr.json
new file mode 100644
index 0000000000..84d231ea07
--- /dev/null
+++ b/contracts/configs/slither/.slither.config-ccip-pr.json
@@ -0,0 +1,4 @@
+{
+  "filter_paths": "(openzeppelin|mocks/|test/|tests/|testhelpers)",
+  "detectors_to_exclude": "pragma,solc-version,naming-convention,assembly,reentrancy-events,timestamp,calls-loop,unused-return"
+}
diff --git a/contracts/configs/slither/.slither.config-default-pr.json b/contracts/configs/slither/.slither.config-default-pr.json
new file mode 100644
index 0000000000..1ef145a795
--- /dev/null
+++ b/contracts/configs/slither/.slither.config-default-pr.json
@@ -0,0 +1,4 @@
+{
+  "filter_paths": "(openzeppelin|mocks/|test/|tests/|testhelpers)",
+  "detectors_to_exclude": "pragma"
+}
diff --git a/contracts/gas-snapshots/ccip.gas-snapshot b/contracts/gas-snapshots/ccip.gas-snapshot
index 3c9bbec852..1658bd8dcb 100644
--- a/contracts/gas-snapshots/ccip.gas-snapshot
+++ b/contracts/gas-snapshots/ccip.gas-snapshot
@@ -10,8 +10,8 @@ AggregateTokenLimiter_getTokenBucket:test_GetTokenBucket_Success() (gas: 19691)
 AggregateTokenLimiter_getTokenBucket:test_Refill_Success() (gas: 40911)
 AggregateTokenLimiter_getTokenBucket:test_TimeUnderflow_Revert() (gas: 15368)
 AggregateTokenLimiter_getTokenLimitAdmin:test_GetTokenLimitAdmin_Success() (gas: 10531)
-AggregateTokenLimiter_getTokenValue:test_GetTokenValue_Success() (gas: 19652)
-AggregateTokenLimiter_getTokenValue:test_NoTokenPrice_Reverts() (gas: 21237)
+AggregateTokenLimiter_getTokenValue:test_GetTokenValue_Success() (gas: 19668)
+AggregateTokenLimiter_getTokenValue:test_NoTokenPrice_Reverts() (gas: 21253)
 AggregateTokenLimiter_rateLimitValue:test_AggregateValueMaxCapacityExceeded_Revert() (gas: 16418)
 AggregateTokenLimiter_rateLimitValue:test_RateLimitValueSuccess_gas() (gas: 18306)
 AggregateTokenLimiter_setAdmin:test_OnlyOwnerOrAdmin_Revert() (gas: 13047)
@@ -34,7 +34,7 @@ BurnWithFromMintTokenPool_lockOrBurn:test_ChainNotAllowed_Revert() (gas: 28761)
 BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurnRevertNotHealthy_Revert() (gas: 55115)
 BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurn_Success() (gas: 243517)
 BurnWithFromMintTokenPool_lockOrBurn:test_Setup_Success() (gas: 23951)
-CCIPClientExample_sanity:test_ImmutableExamples_Success() (gas: 2132726)
+CCIPClientExample_sanity:test_ImmutableExamples_Success() (gas: 2132684)
 CCIPConfigSetup:test_getCapabilityConfiguration_Success() (gas: 9517)
 CCIPConfig_ConfigStateMachine:test__computeConfigDigest_Success() (gas: 70831)
 CCIPConfig_ConfigStateMachine:test__computeNewConfigWithMeta_InitToRunning_Success() (gas: 363664)
@@ -98,16 +98,16 @@ CommitStore_isUnpausedAndRMNHealthy:test_RMN_Success() (gas: 73420)
 CommitStore_report:test_InvalidIntervalMinLargerThanMax_Revert() (gas: 28670)
 CommitStore_report:test_InvalidInterval_Revert() (gas: 28610)
 CommitStore_report:test_InvalidRootRevert() (gas: 27843)
-CommitStore_report:test_OnlyGasPriceUpdates_Success() (gas: 53253)
-CommitStore_report:test_OnlyPriceUpdateStaleReport_Revert() (gas: 59049)
-CommitStore_report:test_OnlyTokenPriceUpdates_Success() (gas: 53251)
+CommitStore_report:test_OnlyGasPriceUpdates_Success() (gas: 53275)
+CommitStore_report:test_OnlyPriceUpdateStaleReport_Revert() (gas: 59071)
+CommitStore_report:test_OnlyTokenPriceUpdates_Success() (gas: 53273)
 CommitStore_report:test_Paused_Revert() (gas: 21259)
-CommitStore_report:test_ReportAndPriceUpdate_Success() (gas: 84242)
-CommitStore_report:test_ReportOnlyRootSuccess_gas() (gas: 56313)
+CommitStore_report:test_ReportAndPriceUpdate_Success() (gas: 84264)
+CommitStore_report:test_ReportOnlyRootSuccess_gas() (gas: 56249)
 CommitStore_report:test_RootAlreadyCommitted_Revert() (gas: 63969)
-CommitStore_report:test_StaleReportWithRoot_Success() (gas: 119332)
+CommitStore_report:test_StaleReportWithRoot_Success() (gas: 119364)
 CommitStore_report:test_Unhealthy_Revert() (gas: 44751)
-CommitStore_report:test_ValidPriceUpdateThenStaleReportWithRoot_Success() (gas: 100714)
+CommitStore_report:test_ValidPriceUpdateThenStaleReportWithRoot_Success() (gas: 100752)
 CommitStore_report:test_ZeroEpochAndRound_Revert() (gas: 27626)
 CommitStore_resetUnblessedRoots:test_OnlyOwner_Revert() (gas: 11325)
 CommitStore_resetUnblessedRoots:test_ResetUnblessedRoots_Success() (gas: 143718)
@@ -123,7 +123,7 @@ CommitStore_verify:test_Paused_Revert() (gas: 18496)
 CommitStore_verify:test_TooManyLeaves_Revert() (gas: 36785)
 DefensiveExampleTest:test_HappyPath_Success() (gas: 200018)
 DefensiveExampleTest:test_Recovery() (gas: 424256)
-E2E:test_E2E_3MessagesSuccess_gas() (gas: 1103907)
+E2E:test_E2E_3MessagesSuccess_gas() (gas: 1100023)
 EVM2EVMOffRamp__releaseOrMintToken:test__releaseOrMintToken_NotACompatiblePool_Revert() (gas: 37797)
 EVM2EVMOffRamp__releaseOrMintToken:test__releaseOrMintToken_Success() (gas: 103733)
 EVM2EVMOffRamp__releaseOrMintToken:test__releaseOrMintToken_TokenHandlingError_transfer_Revert() (gas: 85258)
@@ -131,20 +131,20 @@ EVM2EVMOffRamp__releaseOrMintToken:test_releaseOrMintToken_InvalidDataLength_Rev
 EVM2EVMOffRamp__releaseOrMintToken:test_releaseOrMintToken_ReleaseOrMintBalanceMismatch_Revert() (gas: 94302)
 EVM2EVMOffRamp__releaseOrMintToken:test_releaseOrMintToken_TokenHandlingError_BalanceOf_Revert() (gas: 39768)
 EVM2EVMOffRamp__releaseOrMintToken:test_releaseOrMintToken_skip_ReleaseOrMintBalanceMismatch_if_pool_Revert() (gas: 86559)
-EVM2EVMOffRamp__releaseOrMintTokens:test_OverValueWithARLOff_Success() (gas: 385176)
-EVM2EVMOffRamp__releaseOrMintTokens:test_PriceNotFoundForToken_Reverts() (gas: 141858)
-EVM2EVMOffRamp__releaseOrMintTokens:test_RateLimitErrors_Reverts() (gas: 802991)
-EVM2EVMOffRamp__releaseOrMintTokens:test_TokenHandlingError_Reverts() (gas: 179228)
+EVM2EVMOffRamp__releaseOrMintTokens:test_OverValueWithARLOff_Success() (gas: 385246)
+EVM2EVMOffRamp__releaseOrMintTokens:test_PriceNotFoundForToken_Reverts() (gas: 141896)
+EVM2EVMOffRamp__releaseOrMintTokens:test_RateLimitErrors_Reverts() (gas: 803071)
+EVM2EVMOffRamp__releaseOrMintTokens:test_TokenHandlingError_Reverts() (gas: 179244)
 EVM2EVMOffRamp__releaseOrMintTokens:test__releaseOrMintTokens_NotACompatiblePool_Reverts() (gas: 29240)
 EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokens_InvalidDataLengthReturnData_Revert() (gas: 66444)
 EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokens_InvalidEVMAddress_Revert() (gas: 43320)
-EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokens_Success() (gas: 210936)
-EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokens_destDenominatedDecimals_Success() (gas: 222200)
+EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokens_Success() (gas: 210968)
+EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokens_destDenominatedDecimals_Success() (gas: 222232)
 EVM2EVMOffRamp__report:test_Report_Success() (gas: 126637)
-EVM2EVMOffRamp__trialExecute:test_RateLimitError_Success() (gas: 237775)
-EVM2EVMOffRamp__trialExecute:test_TokenHandlingErrorIsCaught_Success() (gas: 246375)
-EVM2EVMOffRamp__trialExecute:test_TokenPoolIsNotAContract_Success() (gas: 329796)
-EVM2EVMOffRamp__trialExecute:test_trialExecute_Success() (gas: 312233)
+EVM2EVMOffRamp__trialExecute:test_RateLimitError_Success() (gas: 237791)
+EVM2EVMOffRamp__trialExecute:test_TokenHandlingErrorIsCaught_Success() (gas: 246391)
+EVM2EVMOffRamp__trialExecute:test_TokenPoolIsNotAContract_Success() (gas: 329828)
+EVM2EVMOffRamp__trialExecute:test_trialExecute_Success() (gas: 312265)
 EVM2EVMOffRamp_ccipReceive:test_Reverts() (gas: 17030)
 EVM2EVMOffRamp_constructor:test_CommitStoreAlreadyInUse_Revert() (gas: 153727)
 EVM2EVMOffRamp_constructor:test_Constructor_Success() (gas: 5665947)
@@ -152,7 +152,7 @@ EVM2EVMOffRamp_constructor:test_ZeroOnRampAddress_Revert() (gas: 144461)
 EVM2EVMOffRamp_execute:test_EmptyReport_Revert() (gas: 21318)
 EVM2EVMOffRamp_execute:test_InvalidMessageId_Revert() (gas: 36432)
 EVM2EVMOffRamp_execute:test_InvalidSourceChain_Revert() (gas: 51598)
-EVM2EVMOffRamp_execute:test_InvalidSourcePoolAddress_Success() (gas: 473297)
+EVM2EVMOffRamp_execute:test_InvalidSourcePoolAddress_Success() (gas: 473329)
 EVM2EVMOffRamp_execute:test_ManualExecutionNotYetEnabled_Revert() (gas: 47668)
 EVM2EVMOffRamp_execute:test_MessageTooLarge_Revert() (gas: 152359)
 EVM2EVMOffRamp_execute:test_Paused_Revert() (gas: 102842)
@@ -162,26 +162,26 @@ EVM2EVMOffRamp_execute:test_RootNotCommitted_Revert() (gas: 42539)
 EVM2EVMOffRamp_execute:test_SingleMessageNoTokensUnordered_Success() (gas: 157347)
 EVM2EVMOffRamp_execute:test_SingleMessageNoTokens_Success() (gas: 172692)
 EVM2EVMOffRamp_execute:test_SingleMessageToNonCCIPReceiver_Success() (gas: 247069)
-EVM2EVMOffRamp_execute:test_SingleMessagesNoTokensSuccess_gas() (gas: 114153)
-EVM2EVMOffRamp_execute:test_SkippedIncorrectNonceStillExecutes_Success() (gas: 407419)
+EVM2EVMOffRamp_execute:test_SingleMessagesNoTokensSuccess_gas() (gas: 113842)
+EVM2EVMOffRamp_execute:test_SkippedIncorrectNonceStillExecutes_Success() (gas: 407451)
 EVM2EVMOffRamp_execute:test_SkippedIncorrectNonce_Success() (gas: 54096)
 EVM2EVMOffRamp_execute:test_StrictUntouchedToSuccess_Success() (gas: 131047)
 EVM2EVMOffRamp_execute:test_TokenDataMismatch_Revert() (gas: 52090)
-EVM2EVMOffRamp_execute:test_TwoMessagesWithTokensAndGE_Success() (gas: 563321)
-EVM2EVMOffRamp_execute:test_TwoMessagesWithTokensSuccess_gas() (gas: 495444)
+EVM2EVMOffRamp_execute:test_TwoMessagesWithTokensAndGE_Success() (gas: 563385)
+EVM2EVMOffRamp_execute:test_TwoMessagesWithTokensSuccess_gas() (gas: 494182)
 EVM2EVMOffRamp_execute:test_UnexpectedTokenData_Revert() (gas: 35383)
-EVM2EVMOffRamp_execute:test_Unhealthy_Revert() (gas: 544577)
+EVM2EVMOffRamp_execute:test_Unhealthy_Revert() (gas: 544641)
 EVM2EVMOffRamp_execute:test_UnsupportedNumberOfTokens_Revert() (gas: 64326)
 EVM2EVMOffRamp_execute:test__execute_SkippedAlreadyExecutedMessageUnordered_Success() (gas: 122322)
 EVM2EVMOffRamp_execute:test__execute_SkippedAlreadyExecutedMessage_Success() (gas: 142532)
 EVM2EVMOffRamp_execute:test_execute_RouterYULCall_Success() (gas: 427337)
 EVM2EVMOffRamp_executeSingleMessage:test_MessageSender_Revert() (gas: 18502)
-EVM2EVMOffRamp_executeSingleMessage:test_NonContractWithTokens_Success() (gas: 278065)
+EVM2EVMOffRamp_executeSingleMessage:test_NonContractWithTokens_Success() (gas: 278097)
 EVM2EVMOffRamp_executeSingleMessage:test_NonContract_Success() (gas: 18659)
-EVM2EVMOffRamp_executeSingleMessage:test_TokenHandlingError_Revert() (gas: 221405)
+EVM2EVMOffRamp_executeSingleMessage:test_TokenHandlingError_Revert() (gas: 223921)
 EVM2EVMOffRamp_executeSingleMessage:test_ZeroGasDONExecution_Revert() (gas: 47881)
 EVM2EVMOffRamp_executeSingleMessage:test_executeSingleMessage_NoTokens_Success() (gas: 47352)
-EVM2EVMOffRamp_executeSingleMessage:test_executeSingleMessage_WithTokens_Success() (gas: 313885)
+EVM2EVMOffRamp_executeSingleMessage:test_executeSingleMessage_WithTokens_Success() (gas: 313917)
 EVM2EVMOffRamp_executeSingleMessage:test_executeSingleMessage_ZeroGasZeroData_Success() (gas: 70008)
 EVM2EVMOffRamp_execute_upgrade:test_V2NonceNewSenderStartsAtZero_Success() (gas: 229319)
 EVM2EVMOffRamp_execute_upgrade:test_V2NonceStartsAtV1Nonce_Success() (gas: 276790)
@@ -195,13 +195,13 @@ EVM2EVMOffRamp_manuallyExecute:test_ManualExecFailedTx_Revert() (gas: 185829)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecForkedChain_Revert() (gas: 27049)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecGasLimitMismatch_Revert() (gas: 45155)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 27468)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithMultipleMessagesAndSourceTokens_Success() (gas: 530087)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithSourceTokens_Success() (gas: 345726)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithMultipleMessagesAndSourceTokens_Success() (gas: 530151)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithSourceTokens_Success() (gas: 345758)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExec_Success() (gas: 187324)
-EVM2EVMOffRamp_manuallyExecute:test_ReentrancyManualExecuteFails_Success() (gas: 2321890)
-EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_DestinationGasAmountCountMismatch_Revert() (gas: 362933)
+EVM2EVMOffRamp_manuallyExecute:test_ReentrancyManualExecuteFails_Success() (gas: 2321906)
+EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_DestinationGasAmountCountMismatch_Revert() (gas: 362965)
 EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 143900)
-EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_InvalidTokenGasOverride_Revert() (gas: 366072)
+EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_InvalidTokenGasOverride_Revert() (gas: 366104)
 EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_LowGasLimitManualExec_Success() (gas: 482691)
 EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_WithGasOverride_Success() (gas: 189727)
 EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_WithInvalidReceiverExecutionGasOverride_Revert() (gas: 153641)
@@ -225,47 +225,48 @@ EVM2EVMOnRamp_forwardFromRouter:test_InvalidAddressEncodePacked_Revert() (gas: 3
 EVM2EVMOnRamp_forwardFromRouter:test_InvalidAddress_Revert() (gas: 38440)
 EVM2EVMOnRamp_forwardFromRouter:test_InvalidChainSelector_Revert() (gas: 25489)
 EVM2EVMOnRamp_forwardFromRouter:test_InvalidExtraArgsTag_Revert() (gas: 25275)
-EVM2EVMOnRamp_forwardFromRouter:test_MaxCapacityExceeded_Revert() (gas: 85997)
+EVM2EVMOnRamp_forwardFromRouter:test_MaxCapacityExceeded_Revert() (gas: 86013)
 EVM2EVMOnRamp_forwardFromRouter:test_MaxFeeBalanceReached_Revert() (gas: 36457)
 EVM2EVMOnRamp_forwardFromRouter:test_MessageGasLimitTooHigh_Revert() (gas: 29015)
 EVM2EVMOnRamp_forwardFromRouter:test_MessageTooLarge_Revert() (gas: 107571)
 EVM2EVMOnRamp_forwardFromRouter:test_OriginalSender_Revert() (gas: 22679)
-EVM2EVMOnRamp_forwardFromRouter:test_OverValueWithARLOff_Success() (gas: 224581)
+EVM2EVMOnRamp_forwardFromRouter:test_OverValueWithARLOff_Success() (gas: 227119)
 EVM2EVMOnRamp_forwardFromRouter:test_Paused_Revert() (gas: 53072)
 EVM2EVMOnRamp_forwardFromRouter:test_Permissions_Revert() (gas: 25481)
-EVM2EVMOnRamp_forwardFromRouter:test_PriceNotFoundForToken_Revert() (gas: 59303)
+EVM2EVMOnRamp_forwardFromRouter:test_PriceNotFoundForToken_Revert() (gas: 59341)
 EVM2EVMOnRamp_forwardFromRouter:test_ShouldIncrementNonceOnlyOnOrdered_Success() (gas: 179148)
 EVM2EVMOnRamp_forwardFromRouter:test_ShouldIncrementSeqNumAndNonce_Success() (gas: 177430)
-EVM2EVMOnRamp_forwardFromRouter:test_ShouldStoreNonLinkFees() (gas: 137234)
-EVM2EVMOnRamp_forwardFromRouter:test_SourceTokenDataTooLarge_Revert() (gas: 3822827)
+EVM2EVMOnRamp_forwardFromRouter:test_ShouldStoreNonLinkFees() (gas: 137254)
+EVM2EVMOnRamp_forwardFromRouter:test_SourceTokenDataTooLarge_Revert() (gas: 3825327)
 EVM2EVMOnRamp_forwardFromRouter:test_TooManyTokens_Revert() (gas: 30187)
 EVM2EVMOnRamp_forwardFromRouter:test_Unhealthy_Revert() (gas: 43300)
-EVM2EVMOnRamp_forwardFromRouter:test_UnsupportedToken_Revert() (gas: 109283)
+EVM2EVMOnRamp_forwardFromRouter:test_UnsupportedToken_Revert() (gas: 109305)
 EVM2EVMOnRamp_forwardFromRouter:test_ZeroAddressReceiver_Revert() (gas: 312579)
 EVM2EVMOnRamp_forwardFromRouter:test_forwardFromRouter_ShouldStoreLinkFees_Success() (gas: 112322)
 EVM2EVMOnRamp_forwardFromRouter:test_forwardFromRouter_UnsupportedToken_Revert() (gas: 72206)
-EVM2EVMOnRamp_forwardFromRouter:test_forwardFromRouter_correctSourceTokenData_Success() (gas: 710443)
+EVM2EVMOnRamp_forwardFromRouter:test_forwardFromRouter_correctSourceTokenData_Success() (gas: 712975)
 EVM2EVMOnRamp_forwardFromRouter_upgrade:test_V2NonceNewSenderStartsAtZero_Success() (gas: 147664)
 EVM2EVMOnRamp_forwardFromRouter_upgrade:test_V2NonceStartsAtV1Nonce_Success() (gas: 190529)
 EVM2EVMOnRamp_forwardFromRouter_upgrade:test_V2SenderNoncesReadsPreviousRamp_Success() (gas: 121320)
 EVM2EVMOnRamp_forwardFromRouter_upgrade:test_V2_Success() (gas: 95349)
 EVM2EVMOnRamp_getDataAvailabilityCost:test_EmptyMessageCalculatesDataAvailabilityCost_Success() (gas: 20544)
 EVM2EVMOnRamp_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCost_Success() (gas: 20912)
-EVM2EVMOnRamp_getFee:test_EmptyMessage_Success() (gas: 78242)
-EVM2EVMOnRamp_getFee:test_HighGasMessage_Success() (gas: 234090)
+EVM2EVMOnRamp_getFee:test_EmptyMessage_Success() (gas: 78230)
+EVM2EVMOnRamp_getFee:test_GetFeeOfZeroForTokenMessage_Success() (gas: 81762)
+EVM2EVMOnRamp_getFee:test_HighGasMessage_Success() (gas: 234078)
 EVM2EVMOnRamp_getFee:test_MessageGasLimitTooHigh_Revert() (gas: 16715)
 EVM2EVMOnRamp_getFee:test_MessageTooLarge_Revert() (gas: 95271)
-EVM2EVMOnRamp_getFee:test_MessageWithDataAndTokenTransfer_Success() (gas: 159352)
+EVM2EVMOnRamp_getFee:test_MessageWithDataAndTokenTransfer_Success() (gas: 159436)
 EVM2EVMOnRamp_getFee:test_NotAFeeToken_Revert() (gas: 24089)
-EVM2EVMOnRamp_getFee:test_SingleTokenMessage_Success() (gas: 117902)
+EVM2EVMOnRamp_getFee:test_SingleTokenMessage_Success() (gas: 117922)
 EVM2EVMOnRamp_getFee:test_TooManyTokens_Revert() (gas: 19902)
-EVM2EVMOnRamp_getFee:test_ZeroDataAvailabilityMultiplier_Success() (gas: 64654)
+EVM2EVMOnRamp_getFee:test_ZeroDataAvailabilityMultiplier_Success() (gas: 64648)
 EVM2EVMOnRamp_getSupportedTokens:test_GetSupportedTokens_Revert() (gas: 10460)
 EVM2EVMOnRamp_getTokenPool:test_GetTokenPool_Success() (gas: 35195)
-EVM2EVMOnRamp_getTokenTransferCost:test_CustomTokenBpsFee_Success() (gas: 45104)
+EVM2EVMOnRamp_getTokenTransferCost:test_CustomTokenBpsFee_Success() (gas: 45120)
 EVM2EVMOnRamp_getTokenTransferCost:test_FeeTokenBpsFee_Success() (gas: 33019)
 EVM2EVMOnRamp_getTokenTransferCost:test_LargeTokenTransferChargesMaxFeeAndGas_Success() (gas: 28296)
-EVM2EVMOnRamp_getTokenTransferCost:test_MixedTokenTransferFee_Success() (gas: 126357)
+EVM2EVMOnRamp_getTokenTransferCost:test_MixedTokenTransferFee_Success() (gas: 126453)
 EVM2EVMOnRamp_getTokenTransferCost:test_NoTokenTransferChargesZeroFee_Success() (gas: 15238)
 EVM2EVMOnRamp_getTokenTransferCost:test_SmallTokenTransferChargesMinFeeAndGas_Success() (gas: 28104)
 EVM2EVMOnRamp_getTokenTransferCost:test_UnsupportedToken_Revert() (gas: 21248)
@@ -275,7 +276,7 @@ EVM2EVMOnRamp_getTokenTransferCost:test__getTokenTransferCost_selfServeUsesDefau
 EVM2EVMOnRamp_linkAvailableForPayment:test_InsufficientLinkBalance_Success() (gas: 32615)
 EVM2EVMOnRamp_linkAvailableForPayment:test_LinkAvailableForPayment_Success() (gas: 134833)
 EVM2EVMOnRamp_payNops:test_AdminPayNops_Success() (gas: 143159)
-EVM2EVMOnRamp_payNops:test_InsufficientBalance_Revert() (gas: 26543)
+EVM2EVMOnRamp_payNops:test_InsufficientBalance_Revert() (gas: 29043)
 EVM2EVMOnRamp_payNops:test_NoFeesToPay_Revert() (gas: 127367)
 EVM2EVMOnRamp_payNops:test_NoNopsToPay_Revert() (gas: 133251)
 EVM2EVMOnRamp_payNops:test_NopPayNops_Success() (gas: 146446)
@@ -307,7 +308,7 @@ EVM2EVMOnRamp_withdrawNonLinkFees:test_SettlingBalance_Success() (gas: 272035)
 EVM2EVMOnRamp_withdrawNonLinkFees:test_WithdrawNonLinkFees_Success() (gas: 53446)
 EVM2EVMOnRamp_withdrawNonLinkFees:test_WithdrawToZeroAddress_Revert() (gas: 12830)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_fallbackToWethTransfer() (gas: 96729)
-EtherSenderReceiverTest_ccipReceive:test_ccipReceive_happyPath() (gas: 47688)
+EtherSenderReceiverTest_ccipReceive:test_ccipReceive_happyPath() (gas: 49688)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_wrongToken() (gas: 17384)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_wrongTokenAmount() (gas: 15677)
 EtherSenderReceiverTest_ccipSend:test_ccipSend_reverts_insufficientFee_feeToken() (gas: 99741)
@@ -327,6 +328,132 @@ EtherSenderReceiverTest_validatedMessage:test_validatedMessage_emptyDataOverwrit
 EtherSenderReceiverTest_validatedMessage:test_validatedMessage_invalidTokenAmounts() (gas: 17895)
 EtherSenderReceiverTest_validatedMessage:test_validatedMessage_tokenOverwrittenToWeth() (gas: 25287)
 EtherSenderReceiverTest_validatedMessage:test_validatedMessage_validMessage_extraArgs() (gas: 26292)
+FeeQuoter_applyDestChainConfigUpdates:test_InvalidChainFamilySelector_Revert() (gas: 16503)
+FeeQuoter_applyDestChainConfigUpdates:test_InvalidDestChainConfigDestChainSelectorEqZero_Revert() (gas: 16417)
+FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesDefaultTxGasLimitEqZero_Revert() (gas: 16459)
+FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesDefaultTxGasLimitGtMaxPerMessageGasLimit_Revert() (gas: 39957)
+FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesZeroIntput_Success() (gas: 12342)
+FeeQuoter_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates_Success() (gas: 135870)
+FeeQuoter_applyFeeTokensUpdates:test_ApplyFeeTokensUpdates_Success() (gas: 79896)
+FeeQuoter_applyFeeTokensUpdates:test_OnlyCallableByOwner_Revert() (gas: 12603)
+FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates:test_OnlyCallableByOwnerOrAdmin_Revert() (gas: 11421)
+FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiPerEthUpdatesMultipleTokens_Success() (gas: 54105)
+FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiPerEthUpdatesSingleToken_Success() (gas: 44791)
+FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiPerEthUpdatesZeroInput() (gas: 12257)
+FeeQuoter_applyTokenTransferFeeConfigUpdates:test_ApplyTokenTransferFeeConfig_Success() (gas: 86926)
+FeeQuoter_applyTokenTransferFeeConfigUpdates:test_ApplyTokenTransferFeeZeroInput() (gas: 13089)
+FeeQuoter_applyTokenTransferFeeConfigUpdates:test_InvalidDestBytesOverhead_Revert() (gas: 17071)
+FeeQuoter_applyTokenTransferFeeConfigUpdates:test_OnlyCallableByOwnerOrAdmin_Revert() (gas: 12240)
+FeeQuoter_constructor:test_InvalidLinkTokenEqZeroAddress_Revert() (gas: 107046)
+FeeQuoter_constructor:test_InvalidMaxFeeJuelsPerMsg_Revert() (gas: 111396)
+FeeQuoter_constructor:test_InvalidStalenessThreshold_Revert() (gas: 111449)
+FeeQuoter_constructor:test_Setup_Success() (gas: 5358690)
+FeeQuoter_convertTokenAmount:test_ConvertTokenAmount_Success() (gas: 72739)
+FeeQuoter_convertTokenAmount:test_LinkTokenNotSupported_Revert() (gas: 30963)
+FeeQuoter_getDataAvailabilityCost:test_EmptyMessageCalculatesDataAvailabilityCost_Success() (gas: 94303)
+FeeQuoter_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCostUnsupportedDestChainSelector_Success() (gas: 14614)
+FeeQuoter_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCost_Success() (gas: 20410)
+FeeQuoter_getTokenAndGasPrices:test_GetFeeTokenAndGasPrices_Success() (gas: 70443)
+FeeQuoter_getTokenAndGasPrices:test_StaleGasPrice_Revert() (gas: 16838)
+FeeQuoter_getTokenAndGasPrices:test_UnsupportedChain_Revert() (gas: 16140)
+FeeQuoter_getTokenAndGasPrices:test_ZeroGasPrice_Success() (gas: 45750)
+FeeQuoter_getTokenPrice:test_GetTokenPriceFromFeed_Success() (gas: 62252)
+FeeQuoter_getTokenPrices:test_GetTokenPrices_Success() (gas: 84800)
+FeeQuoter_getTokenTransferCost:test_CustomTokenBpsFee_Success() (gas: 41227)
+FeeQuoter_getTokenTransferCost:test_FeeTokenBpsFee_Success() (gas: 34682)
+FeeQuoter_getTokenTransferCost:test_LargeTokenTransferChargesMaxFeeAndGas_Success() (gas: 27756)
+FeeQuoter_getTokenTransferCost:test_MixedTokenTransferFee_Success() (gas: 101624)
+FeeQuoter_getTokenTransferCost:test_NoTokenTransferChargesZeroFee_Success() (gas: 20354)
+FeeQuoter_getTokenTransferCost:test_SmallTokenTransferChargesMinFeeAndGas_Success() (gas: 27631)
+FeeQuoter_getTokenTransferCost:test_ZeroAmountTokenTransferChargesMinFeeAndGas_Success() (gas: 27587)
+FeeQuoter_getTokenTransferCost:test_ZeroFeeConfigChargesMinFee_Success() (gas: 40013)
+FeeQuoter_getTokenTransferCost:test_getTokenTransferCost_selfServeUsesDefaults_Success() (gas: 29299)
+FeeQuoter_getValidatedFee:test_DestinationChainNotEnabled_Revert() (gas: 18180)
+FeeQuoter_getValidatedFee:test_EmptyMessage_Success() (gas: 85936)
+FeeQuoter_getValidatedFee:test_EnforceOutOfOrder_Revert() (gas: 56735)
+FeeQuoter_getValidatedFee:test_HighGasMessage_Success() (gas: 242354)
+FeeQuoter_getValidatedFee:test_InvalidEVMAddress_Revert() (gas: 22390)
+FeeQuoter_getValidatedFee:test_MessageGasLimitTooHigh_Revert() (gas: 34187)
+FeeQuoter_getValidatedFee:test_MessageTooLarge_Revert() (gas: 100133)
+FeeQuoter_getValidatedFee:test_MessageWithDataAndTokenTransfer_Success() (gas: 147715)
+FeeQuoter_getValidatedFee:test_NotAFeeToken_Revert() (gas: 21043)
+FeeQuoter_getValidatedFee:test_SingleTokenMessage_Success() (gas: 116743)
+FeeQuoter_getValidatedFee:test_TooManyTokens_Revert() (gas: 22526)
+FeeQuoter_getValidatedFee:test_ZeroDataAvailabilityMultiplier_Success() (gas: 64374)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedErc20Above18Decimals_Success() (gas: 2094539)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedErc20Below18Decimals_Success() (gas: 2094497)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFeedAt0Decimals_Success() (gas: 2074616)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFeedAt18Decimals_Success() (gas: 2094271)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFlippedDecimals_Success() (gas: 2094475)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedMaxInt224Value_Success() (gas: 2094287)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedOverStalenessPeriod_Success() (gas: 62004)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeed_Success() (gas: 61884)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPrice_Success() (gas: 61036)
+FeeQuoter_getValidatedTokenPrice:test_OverflowFeedPrice_Revert() (gas: 2093974)
+FeeQuoter_getValidatedTokenPrice:test_StaleFeeToken_Success() (gas: 61563)
+FeeQuoter_getValidatedTokenPrice:test_TokenNotSupportedFeed_Revert() (gas: 109120)
+FeeQuoter_getValidatedTokenPrice:test_TokenNotSupported_Revert() (gas: 13857)
+FeeQuoter_getValidatedTokenPrice:test_UnderflowFeedPrice_Revert() (gas: 2092636)
+FeeQuoter_onReport:test_OnReport_StaleUpdate_Revert() (gas: 43334)
+FeeQuoter_onReport:test_onReport_InvalidForwarder_Reverts() (gas: 23294)
+FeeQuoter_onReport:test_onReport_Success() (gas: 80639)
+FeeQuoter_onReport:test_onReport_UnsupportedToken_Reverts() (gas: 26677)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsDefault_Success() (gas: 17185)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsEnforceOutOfOrder_Revert() (gas: 21290)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsGasLimitTooHigh_Revert() (gas: 18387)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsInvalidExtraArgsTag_Revert() (gas: 17911)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsV1_Success() (gas: 18285)
+FeeQuoter_parseEVMExtraArgsFromBytes:test_EVMExtraArgsV2_Success() (gas: 18401)
+FeeQuoter_processMessageArgs:test_InvalidExtraArgs_Revert() (gas: 18361)
+FeeQuoter_processMessageArgs:test_MalformedEVMExtraArgs_Revert() (gas: 18907)
+FeeQuoter_processMessageArgs:test_MessageFeeTooHigh_Revert() (gas: 16426)
+FeeQuoter_processMessageArgs:test_WitEVMExtraArgsV2_Success() (gas: 26269)
+FeeQuoter_processMessageArgs:test_WithConvertedTokenAmount_Success() (gas: 32441)
+FeeQuoter_processMessageArgs:test_WithEVMExtraArgsV1_Success() (gas: 25881)
+FeeQuoter_processMessageArgs:test_WithEmptyEVMExtraArgs_Success() (gas: 23696)
+FeeQuoter_processMessageArgs:test_WithLinkTokenAmount_Success() (gas: 17375)
+FeeQuoter_updatePrices:test_OnlyCallableByUpdater_Revert() (gas: 12102)
+FeeQuoter_updatePrices:test_OnlyGasPrice_Success() (gas: 23599)
+FeeQuoter_updatePrices:test_OnlyTokenPrice_Success() (gas: 30631)
+FeeQuoter_updatePrices:test_UpdatableByAuthorizedCaller_Success() (gas: 76003)
+FeeQuoter_updatePrices:test_UpdateMultiplePrices_Success() (gas: 151393)
+FeeQuoter_updateTokenPriceFeeds:test_FeedNotUpdated() (gas: 50527)
+FeeQuoter_updateTokenPriceFeeds:test_FeedUnset_Success() (gas: 63626)
+FeeQuoter_updateTokenPriceFeeds:test_FeedUpdatedByNonOwner_Revert() (gas: 19932)
+FeeQuoter_updateTokenPriceFeeds:test_MultipleFeedUpdate_Success() (gas: 88972)
+FeeQuoter_updateTokenPriceFeeds:test_SingleFeedUpdate_Success() (gas: 50821)
+FeeQuoter_updateTokenPriceFeeds:test_ZeroFeeds_Success() (gas: 12296)
+FeeQuoter_validateDestFamilyAddress:test_InvalidEVMAddressEncodePacked_Revert() (gas: 10616)
+FeeQuoter_validateDestFamilyAddress:test_InvalidEVMAddressPrecompiles_Revert() (gas: 3961646)
+FeeQuoter_validateDestFamilyAddress:test_InvalidEVMAddress_Revert() (gas: 10800)
+FeeQuoter_validateDestFamilyAddress:test_ValidEVMAddress_Success() (gas: 6704)
+FeeQuoter_validateDestFamilyAddress:test_ValidNonEVMAddress_Success() (gas: 6484)
+FeeQuoter_validatePoolReturnData:test_InvalidEVMAddressDestToken_Revert() (gas: 42748)
+FeeQuoter_validatePoolReturnData:test_ProcessPoolReturnData_Success() (gas: 73252)
+FeeQuoter_validatePoolReturnData:test_SourceTokenDataTooLarge_Revert() (gas: 107744)
+FeeQuoter_validatePoolReturnData:test_TokenAmountArraysMismatching_Revert() (gas: 40091)
+HybridUSDCTokenPoolMigrationTests:test_LockOrBurn_LocKReleaseMechanism_then_switchToPrimary_Success() (gas: 208137)
+HybridUSDCTokenPoolMigrationTests:test_LockOrBurn_PrimaryMechanism_Success() (gas: 135392)
+HybridUSDCTokenPoolMigrationTests:test_LockOrBurn_WhileMigrationPause_Revert() (gas: 106624)
+HybridUSDCTokenPoolMigrationTests:test_LockOrBurn_onLockReleaseMechanism_Success() (gas: 143884)
+HybridUSDCTokenPoolMigrationTests:test_MintOrRelease_OnLockReleaseMechanism_Success() (gas: 230399)
+HybridUSDCTokenPoolMigrationTests:test_MintOrRelease_OnLockReleaseMechanism_then_switchToPrimary_Success() (gas: 438259)
+HybridUSDCTokenPoolMigrationTests:test_MintOrRelease_incomingMessageWithPrimaryMechanism() (gas: 269968)
+HybridUSDCTokenPoolMigrationTests:test_burnLockedUSDC_invalidPermissions_Revert() (gas: 39124)
+HybridUSDCTokenPoolMigrationTests:test_cancelExistingCCTPMigrationProposal() (gas: 31124)
+HybridUSDCTokenPoolMigrationTests:test_cannotCancelANonExistentMigrationProposal() (gas: 12628)
+HybridUSDCTokenPoolMigrationTests:test_cannotModifyLiquidityWithoutPermissions_Revert() (gas: 17133)
+HybridUSDCTokenPoolMigrationTests:test_lockOrBurn_then_BurnInCCTPMigration_Success() (gas: 252432)
+HybridUSDCTokenPoolMigrationTests:test_transferLiquidity_Success() (gas: 157049)
+HybridUSDCTokenPoolMigrationTests:test_withdrawLiquidity_Success() (gas: 140780)
+HybridUSDCTokenPoolTests:test_LockOrBurn_LocKReleaseMechanism_then_switchToPrimary_Success() (gas: 208102)
+HybridUSDCTokenPoolTests:test_LockOrBurn_PrimaryMechanism_Success() (gas: 135365)
+HybridUSDCTokenPoolTests:test_LockOrBurn_WhileMigrationPause_Revert() (gas: 106589)
+HybridUSDCTokenPoolTests:test_LockOrBurn_onLockReleaseMechanism_Success() (gas: 143832)
+HybridUSDCTokenPoolTests:test_MintOrRelease_OnLockReleaseMechanism_Success() (gas: 230365)
+HybridUSDCTokenPoolTests:test_MintOrRelease_OnLockReleaseMechanism_then_switchToPrimary_Success() (gas: 438171)
+HybridUSDCTokenPoolTests:test_MintOrRelease_incomingMessageWithPrimaryMechanism() (gas: 269912)
+HybridUSDCTokenPoolTests:test_withdrawLiquidity_Success() (gas: 140774)
 LockReleaseTokenPoolAndProxy_setRebalancer:test_SetRebalancer_Revert() (gas: 10970)
 LockReleaseTokenPoolAndProxy_setRebalancer:test_SetRebalancer_Success() (gas: 17992)
 LockReleaseTokenPoolPoolAndProxy_canAcceptLiquidity:test_CanAcceptLiquidity_Success() (gas: 3368110)
@@ -372,42 +499,42 @@ MultiAggregateRateLimiter_applyRateLimiterConfigUpdates:test_UpdateExistingConfi
 MultiAggregateRateLimiter_applyRateLimiterConfigUpdates:test_UpdateExistingConfig_Success() (gas: 53092)
 MultiAggregateRateLimiter_applyRateLimiterConfigUpdates:test_ZeroChainSelector_Revert() (gas: 17019)
 MultiAggregateRateLimiter_applyRateLimiterConfigUpdates:test_ZeroConfigs_Success() (gas: 12295)
-MultiAggregateRateLimiter_constructor:test_ConstructorNoAuthorizedCallers_Success() (gas: 2149637)
-MultiAggregateRateLimiter_constructor:test_Constructor_Success() (gas: 2265894)
+MultiAggregateRateLimiter_constructor:test_ConstructorNoAuthorizedCallers_Success() (gas: 2149547)
+MultiAggregateRateLimiter_constructor:test_Constructor_Success() (gas: 2265849)
 MultiAggregateRateLimiter_getTokenBucket:test_GetTokenBucket_Success() (gas: 30248)
 MultiAggregateRateLimiter_getTokenBucket:test_Refill_Success() (gas: 47358)
 MultiAggregateRateLimiter_getTokenBucket:test_TimeUnderflow_Revert() (gas: 15821)
-MultiAggregateRateLimiter_getTokenValue:test_GetTokenValue_Success() (gas: 19668)
-MultiAggregateRateLimiter_getTokenValue:test_NoTokenPrice_Reverts() (gas: 21253)
+MultiAggregateRateLimiter_getTokenValue:test_GetTokenValue_Success() (gas: 19662)
+MultiAggregateRateLimiter_getTokenValue:test_NoTokenPrice_Reverts() (gas: 21247)
 MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageFromUnauthorizedCaller_Revert() (gas: 14527)
-MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithDifferentTokensOnDifferentChains_Success() (gas: 213612)
-MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithDisabledRateLimitToken_Success() (gas: 60443)
+MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithDifferentTokensOnDifferentChains_Success() (gas: 213638)
+MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithDisabledRateLimitToken_Success() (gas: 60437)
 MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithNoTokens_Success() (gas: 17593)
 MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithRateLimitDisabled_Success() (gas: 44895)
-MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithRateLimitExceeded_Revert() (gas: 50510)
-MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithRateLimitReset_Success() (gas: 78604)
-MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithTokensOnDifferentChains_Success() (gas: 311885)
-MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithTokens_Success() (gas: 54696)
-MultiAggregateRateLimiter_onOutboundMessage:test_RateLimitValueDifferentLanes_Success() (gas: 9223372036854754743)
-MultiAggregateRateLimiter_onOutboundMessage:test_ValidateMessageWithNoTokens_Success() (gas: 19104)
-MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageFromUnauthorizedCaller_Revert() (gas: 15778)
-MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithDifferentTokensOnDifferentChains_Success() (gas: 213600)
-MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithDisabledRateLimitToken_Success() (gas: 62178)
-MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithRateLimitDisabled_Success() (gas: 46683)
-MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithRateLimitExceeded_Revert() (gas: 52283)
-MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithRateLimitReset_Success() (gas: 79669)
-MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithTokensOnDifferentChains_Success() (gas: 312099)
-MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithTokens_Success() (gas: 56453)
-MultiAggregateRateLimiter_setPriceRegistry:test_OnlyOwner_Revert() (gas: 11292)
-MultiAggregateRateLimiter_setPriceRegistry:test_Owner_Success() (gas: 19080)
-MultiAggregateRateLimiter_setPriceRegistry:test_ZeroAddress_Revert() (gas: 10564)
-MultiAggregateRateLimiter_updateRateLimitTokens:test_NonOwner_Revert() (gas: 18872)
-MultiAggregateRateLimiter_updateRateLimitTokens:test_UpdateRateLimitTokensMultipleChains_Success() (gas: 279906)
-MultiAggregateRateLimiter_updateRateLimitTokens:test_UpdateRateLimitTokensSingleChain_Success() (gas: 254501)
+MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithRateLimitExceeded_Revert() (gas: 50542)
+MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithRateLimitReset_Success() (gas: 78668)
+MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithTokensOnDifferentChains_Success() (gas: 311927)
+MultiAggregateRateLimiter_onInboundMessage:test_ValidateMessageWithTokens_Success() (gas: 54728)
+MultiAggregateRateLimiter_onOutboundMessage:test_RateLimitValueDifferentLanes_Success() (gas: 1073667529)
+MultiAggregateRateLimiter_onOutboundMessage:test_ValidateMessageWithNoTokens_Success() (gas: 19149)
+MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageFromUnauthorizedCaller_Revert() (gas: 15823)
+MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithDifferentTokensOnDifferentChains_Success() (gas: 213716)
+MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithDisabledRateLimitToken_Success() (gas: 62217)
+MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithRateLimitDisabled_Success() (gas: 46728)
+MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithRateLimitExceeded_Revert() (gas: 52360)
+MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithRateLimitReset_Success() (gas: 79913)
+MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithTokensOnDifferentChains_Success() (gas: 312231)
+MultiAggregateRateLimiter_onOutboundMessage:test_onOutboundMessage_ValidateMessageWithTokens_Success() (gas: 56530)
+MultiAggregateRateLimiter_setFeeQuoter:test_OnlyOwner_Revert() (gas: 11313)
+MultiAggregateRateLimiter_setFeeQuoter:test_Owner_Success() (gas: 19066)
+MultiAggregateRateLimiter_setFeeQuoter:test_ZeroAddress_Revert() (gas: 10585)
+MultiAggregateRateLimiter_updateRateLimitTokens:test_NonOwner_Revert() (gas: 18850)
+MultiAggregateRateLimiter_updateRateLimitTokens:test_UpdateRateLimitTokensMultipleChains_Success() (gas: 279972)
+MultiAggregateRateLimiter_updateRateLimitTokens:test_UpdateRateLimitTokensSingleChain_Success() (gas: 254523)
 MultiAggregateRateLimiter_updateRateLimitTokens:test_UpdateRateLimitTokens_AddsAndRemoves_Success() (gas: 204488)
-MultiAggregateRateLimiter_updateRateLimitTokens:test_UpdateRateLimitTokens_RemoveNonExistentToken_Success() (gas: 28681)
-MultiAggregateRateLimiter_updateRateLimitTokens:test_ZeroDestToken_Revert() (gas: 18309)
-MultiAggregateRateLimiter_updateRateLimitTokens:test_ZeroSourceToken_Revert() (gas: 18238)
+MultiAggregateRateLimiter_updateRateLimitTokens:test_UpdateRateLimitTokens_RemoveNonExistentToken_Success() (gas: 28703)
+MultiAggregateRateLimiter_updateRateLimitTokens:test_ZeroDestToken_Revert() (gas: 18287)
+MultiAggregateRateLimiter_updateRateLimitTokens:test_ZeroSourceToken_Revert() (gas: 18216)
 MultiOCR3Base_setOCR3Configs:test_FMustBePositive_Revert() (gas: 59331)
 MultiOCR3Base_setOCR3Configs:test_FTooHigh_Revert() (gas: 44298)
 MultiOCR3Base_setOCR3Configs:test_RepeatSignerAddress_Revert() (gas: 283711)
@@ -430,31 +557,31 @@ MultiOCR3Base_transmit:test_InsufficientSignatures_Revert() (gas: 76930)
 MultiOCR3Base_transmit:test_NonUniqueSignature_Revert() (gas: 66127)
 MultiOCR3Base_transmit:test_SignatureOutOfRegistration_Revert() (gas: 33419)
 MultiOCR3Base_transmit:test_TooManySignatures_Revert() (gas: 79521)
-MultiOCR3Base_transmit:test_TransmitSigners_gas_Success() (gas: 34131)
+MultiOCR3Base_transmit:test_TransmitSigners_gas_Success() (gas: 34020)
 MultiOCR3Base_transmit:test_TransmitWithExtraCalldataArgs_Revert() (gas: 47114)
 MultiOCR3Base_transmit:test_TransmitWithLessCalldataArgs_Revert() (gas: 25682)
-MultiOCR3Base_transmit:test_TransmitWithoutSignatureVerification_gas_Success() (gas: 18726)
+MultiOCR3Base_transmit:test_TransmitWithoutSignatureVerification_gas_Success() (gas: 18714)
 MultiOCR3Base_transmit:test_UnAuthorizedTransmitter_Revert() (gas: 24191)
 MultiOCR3Base_transmit:test_UnauthorizedSigner_Revert() (gas: 61409)
 MultiOCR3Base_transmit:test_UnconfiguredPlugin_Revert() (gas: 39890)
 MultiOCR3Base_transmit:test_ZeroSignatures_Revert() (gas: 32973)
-MultiOnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy_Success() (gas: 393648)
-MultiRampsE2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1448351)
+MultiOnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy_Success() (gas: 414301)
+MultiRampsE2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1501445)
 NonceManager_NonceIncrementation:test_getIncrementedOutboundNonce_Success() (gas: 37907)
 NonceManager_NonceIncrementation:test_incrementInboundNonce_Skip() (gas: 23694)
 NonceManager_NonceIncrementation:test_incrementInboundNonce_Success() (gas: 38763)
 NonceManager_NonceIncrementation:test_incrementNoncesInboundAndOutbound_Success() (gas: 71847)
-NonceManager_OffRampUpgrade:test_NoPrevOffRampForChain_Success() (gas: 257252)
-NonceManager_OffRampUpgrade:test_UpgradedNonceNewSenderStartsAtZero_Success() (gas: 259369)
-NonceManager_OffRampUpgrade:test_UpgradedNonceStartsAtV1Nonce_Success() (gas: 319959)
-NonceManager_OffRampUpgrade:test_UpgradedOffRampNonceSkipsIfMsgInFlight_Success() (gas: 295278)
-NonceManager_OffRampUpgrade:test_UpgradedSenderNoncesReadsPreviousRampTransitive_Success() (gas: 244940)
-NonceManager_OffRampUpgrade:test_UpgradedSenderNoncesReadsPreviousRamp_Success() (gas: 233260)
-NonceManager_OffRampUpgrade:test_Upgraded_Success() (gas: 150148)
-NonceManager_OnRampUpgrade:test_UpgradeNonceNewSenderStartsAtZero_Success() (gas: 167714)
-NonceManager_OnRampUpgrade:test_UpgradeNonceStartsAtV1Nonce_Success() (gas: 218902)
+NonceManager_OffRampUpgrade:test_NoPrevOffRampForChain_Success() (gas: 260262)
+NonceManager_OffRampUpgrade:test_UpgradedNonceNewSenderStartsAtZero_Success() (gas: 262359)
+NonceManager_OffRampUpgrade:test_UpgradedNonceStartsAtV1Nonce_Success() (gas: 326051)
+NonceManager_OffRampUpgrade:test_UpgradedOffRampNonceSkipsIfMsgInFlight_Success() (gas: 298263)
+NonceManager_OffRampUpgrade:test_UpgradedSenderNoncesReadsPreviousRampTransitive_Success() (gas: 244814)
+NonceManager_OffRampUpgrade:test_UpgradedSenderNoncesReadsPreviousRamp_Success() (gas: 233069)
+NonceManager_OffRampUpgrade:test_Upgraded_Success() (gas: 153186)
+NonceManager_OnRampUpgrade:test_UpgradeNonceNewSenderStartsAtZero_Success() (gas: 168681)
+NonceManager_OnRampUpgrade:test_UpgradeNonceStartsAtV1Nonce_Success() (gas: 220836)
 NonceManager_OnRampUpgrade:test_UpgradeSenderNoncesReadsPreviousRamp_Success() (gas: 125070)
-NonceManager_OnRampUpgrade:test_Upgrade_Success() (gas: 106943)
+NonceManager_OnRampUpgrade:test_Upgrade_Success() (gas: 107910)
 NonceManager_applyPreviousRampsUpdates:test_MultipleRampsUpdates() (gas: 122943)
 NonceManager_applyPreviousRampsUpdates:test_PreviousRampAlreadySetOffRamp_Revert() (gas: 42959)
 NonceManager_applyPreviousRampsUpdates:test_PreviousRampAlreadySetOnRampAndOffRamp_Revert() (gas: 64282)
@@ -469,7 +596,7 @@ OCR2BaseNoChecks_setOCR2Config:test_TooManyTransmitter_Revert() (gas: 36938)
 OCR2BaseNoChecks_setOCR2Config:test_TransmitterCannotBeZeroAddress_Revert() (gas: 24158)
 OCR2BaseNoChecks_transmit:test_ConfigDigestMismatch_Revert() (gas: 17448)
 OCR2BaseNoChecks_transmit:test_ForkedChain_Revert() (gas: 26726)
-OCR2BaseNoChecks_transmit:test_TransmitSuccess_gas() (gas: 27478)
+OCR2BaseNoChecks_transmit:test_TransmitSuccess_gas() (gas: 27466)
 OCR2BaseNoChecks_transmit:test_UnAuthorizedTransmitter_Revert() (gas: 21296)
 OCR2Base_setOCR2Config:test_FMustBePositive_Revert() (gas: 12189)
 OCR2Base_setOCR2Config:test_FTooHigh_Revert() (gas: 12345)
@@ -483,295 +610,196 @@ OCR2Base_transmit:test_ConfigDigestMismatch_Revert() (gas: 19623)
 OCR2Base_transmit:test_ForkedChain_Revert() (gas: 37683)
 OCR2Base_transmit:test_NonUniqueSignature_Revert() (gas: 55309)
 OCR2Base_transmit:test_SignatureOutOfRegistration_Revert() (gas: 20962)
-OCR2Base_transmit:test_Transmit2SignersSuccess_gas() (gas: 51686)
+OCR2Base_transmit:test_Transmit2SignersSuccess_gas() (gas: 51674)
 OCR2Base_transmit:test_UnAuthorizedTransmitter_Revert() (gas: 23484)
 OCR2Base_transmit:test_UnauthorizedSigner_Revert() (gas: 39665)
 OCR2Base_transmit:test_WrongNumberOfSignatures_Revert() (gas: 20557)
-OffRamp__releaseOrMintSingleToken:test__releaseOrMintSingleToken_NotACompatiblePool_Revert() (gas: 38408)
-OffRamp__releaseOrMintSingleToken:test__releaseOrMintSingleToken_Success() (gas: 106250)
-OffRamp__releaseOrMintSingleToken:test__releaseOrMintSingleToken_TokenHandlingError_transfer_Revert() (gas: 87409)
-OffRamp__releaseOrMintSingleToken:test_releaseOrMintToken_InvalidDataLength_Revert() (gas: 38954)
-OffRamp__releaseOrMintSingleToken:test_releaseOrMintToken_ReleaseOrMintBalanceMismatch_Revert() (gas: 96511)
-OffRamp__releaseOrMintSingleToken:test_releaseOrMintToken_TokenHandlingError_BalanceOf_Revert() (gas: 41956)
-OffRamp__releaseOrMintSingleToken:test_releaseOrMintToken_skip_ReleaseOrMintBalanceMismatch_if_pool_Revert() (gas: 88684)
-OffRamp_applySourceChainConfigUpdates:test_AddMultipleChains_Success() (gas: 468115)
-OffRamp_applySourceChainConfigUpdates:test_AddNewChain_Success() (gas: 99227)
+OffRamp__releaseOrMintSingleToken:test__releaseOrMintSingleToken_NotACompatiblePool_Revert() (gas: 40149)
+OffRamp__releaseOrMintSingleToken:test__releaseOrMintSingleToken_Success() (gas: 107130)
+OffRamp__releaseOrMintSingleToken:test__releaseOrMintSingleToken_TokenHandlingError_transfer_Revert() (gas: 88331)
+OffRamp__releaseOrMintSingleToken:test_releaseOrMintToken_InvalidDataLength_Revert() (gas: 39848)
+OffRamp__releaseOrMintSingleToken:test_releaseOrMintToken_ReleaseOrMintBalanceMismatch_Revert() (gas: 97399)
+OffRamp__releaseOrMintSingleToken:test_releaseOrMintToken_TokenHandlingError_BalanceOf_Revert() (gas: 42843)
+OffRamp__releaseOrMintSingleToken:test_releaseOrMintToken_skip_ReleaseOrMintBalanceMismatch_if_pool_Revert() (gas: 89579)
+OffRamp_applySourceChainConfigUpdates:test_AddMultipleChains_Success() (gas: 467917)
+OffRamp_applySourceChainConfigUpdates:test_AddNewChain_Success() (gas: 99183)
 OffRamp_applySourceChainConfigUpdates:test_ApplyZeroUpdates_Success() (gas: 12395)
 OffRamp_applySourceChainConfigUpdates:test_ReplaceExistingChainOnRamp_Revert() (gas: 93181)
-OffRamp_applySourceChainConfigUpdates:test_ReplaceExistingChain_Success() (gas: 109890)
+OffRamp_applySourceChainConfigUpdates:test_ReplaceExistingChain_Success() (gas: 109824)
 OffRamp_applySourceChainConfigUpdates:test_RouterAddress_Revert() (gas: 13263)
 OffRamp_applySourceChainConfigUpdates:test_ZeroOnRampAddress_Revert() (gas: 17988)
-OffRamp_applySourceChainConfigUpdates:test_ZeroSourceChainSelector_Revert() (gas: 15343)
-OffRamp_batchExecute:test_MultipleReportsDifferentChains_Success() (gas: 313594)
-OffRamp_batchExecute:test_MultipleReportsSameChain_Success() (gas: 254984)
-OffRamp_batchExecute:test_MultipleReportsSkipDuplicate_Success() (gas: 166123)
-OffRamp_batchExecute:test_OutOfBoundsGasLimitsAccess_Revert() (gas: 187729)
-OffRamp_batchExecute:test_SingleReport_Success() (gas: 153140)
-OffRamp_batchExecute:test_Unhealthy_Revert() (gas: 518887)
-OffRamp_batchExecute:test_ZeroReports_Revert() (gas: 10439)
-OffRamp_ccipReceive:test_Reverts() (gas: 15684)
+OffRamp_applySourceChainConfigUpdates:test_ZeroSourceChainSelector_Revert() (gas: 15300)
+OffRamp_batchExecute:test_MultipleReportsDifferentChains_Success() (gas: 322171)
+OffRamp_batchExecute:test_MultipleReportsSameChain_Success() (gas: 263506)
+OffRamp_batchExecute:test_MultipleReportsSkipDuplicate_Success() (gas: 169162)
+OffRamp_batchExecute:test_OutOfBoundsGasLimitsAccess_Revert() (gas: 188589)
+OffRamp_batchExecute:test_SingleReport_Success() (gas: 156230)
+OffRamp_batchExecute:test_Unhealthy_Revert() (gas: 533834)
+OffRamp_batchExecute:test_ZeroReports_Revert() (gas: 10461)
+OffRamp_ccipReceive:test_Reverts() (gas: 15773)
 OffRamp_commit:test_InvalidIntervalMinLargerThanMax_Revert() (gas: 67458)
-OffRamp_commit:test_InvalidInterval_Revert() (gas: 59734)
-OffRamp_commit:test_InvalidRootRevert() (gas: 58814)
-OffRamp_commit:test_NoConfigWithOtherConfigPresent_Revert() (gas: 6538106)
-OffRamp_commit:test_NoConfig_Revert() (gas: 6121178)
-OffRamp_commit:test_OnlyGasPriceUpdates_Success() (gas: 106251)
-OffRamp_commit:test_OnlyPriceUpdateStaleReport_Revert() (gas: 116259)
-OffRamp_commit:test_OnlyTokenPriceUpdates_Success() (gas: 106272)
-OffRamp_commit:test_PriceSequenceNumberCleared_Success() (gas: 351586)
-OffRamp_commit:test_ReportAndPriceUpdate_Success() (gas: 159364)
-OffRamp_commit:test_ReportOnlyRootSuccess_gas() (gas: 136569)
-OffRamp_commit:test_RootAlreadyCommitted_Revert() (gas: 136859)
-OffRamp_commit:test_SourceChainNotEnabled_Revert() (gas: 59082)
-OffRamp_commit:test_StaleReportWithRoot_Success() (gas: 225684)
-OffRamp_commit:test_UnauthorizedTransmitter_Revert() (gas: 117566)
-OffRamp_commit:test_Unhealthy_Revert() (gas: 77608)
-OffRamp_commit:test_ValidPriceUpdateThenStaleReportWithRoot_Success() (gas: 205073)
-OffRamp_commit:test_WrongConfigWithoutSigners_Revert() (gas: 6532429)
-OffRamp_commit:test_ZeroEpochAndRound_Revert() (gas: 47788)
-OffRamp_constructor:test_Constructor_Success() (gas: 6125436)
-OffRamp_constructor:test_SourceChainSelector_Revert() (gas: 137067)
-OffRamp_constructor:test_ZeroChainSelector_Revert() (gas: 103784)
-OffRamp_constructor:test_ZeroNonceManager_Revert() (gas: 101677)
-OffRamp_constructor:test_ZeroOnRampAddress_Revert() (gas: 139641)
-OffRamp_constructor:test_ZeroRMNProxy_Revert() (gas: 101554)
-OffRamp_constructor:test_ZeroTokenAdminRegistry_Revert() (gas: 101599)
-OffRamp_execute:test_IncorrectArrayType_Revert() (gas: 17261)
-OffRamp_execute:test_LargeBatch_Success() (gas: 1726826)
-OffRamp_execute:test_MultipleReportsWithPartialValidationFailures_Success() (gas: 349476)
-OffRamp_execute:test_MultipleReports_Success() (gas: 276933)
-OffRamp_execute:test_NoConfigWithOtherConfigPresent_Revert() (gas: 6588804)
-OffRamp_execute:test_NoConfig_Revert() (gas: 6171638)
-OffRamp_execute:test_NonArray_Revert() (gas: 27733)
-OffRamp_execute:test_SingleReport_Success() (gas: 172458)
-OffRamp_execute:test_UnauthorizedTransmitter_Revert() (gas: 147390)
-OffRamp_execute:test_WrongConfigWithSigners_Revert() (gas: 6950878)
-OffRamp_execute:test_ZeroReports_Revert() (gas: 17159)
-OffRamp_executeSingleMessage:test_MessageSender_Revert() (gas: 18190)
-OffRamp_executeSingleMessage:test_NonContractWithTokens_Success() (gas: 246556)
-OffRamp_executeSingleMessage:test_NonContract_Success() (gas: 20472)
-OffRamp_executeSingleMessage:test_TokenHandlingError_Revert() (gas: 205195)
-OffRamp_executeSingleMessage:test_ZeroGasDONExecution_Revert() (gas: 48734)
-OffRamp_executeSingleMessage:test_executeSingleMessage_NoTokens_Success() (gas: 48257)
-OffRamp_executeSingleMessage:test_executeSingleMessage_WithFailingValidationNoRouterCall_Revert() (gas: 229631)
-OffRamp_executeSingleMessage:test_executeSingleMessage_WithFailingValidation_Revert() (gas: 86202)
-OffRamp_executeSingleMessage:test_executeSingleMessage_WithTokens_Success() (gas: 277436)
-OffRamp_executeSingleMessage:test_executeSingleMessage_WithValidation_Success() (gas: 92436)
-OffRamp_executeSingleReport:test_DisabledSourceChain_Revert() (gas: 35126)
-OffRamp_executeSingleReport:test_EmptyReport_Revert() (gas: 23922)
-OffRamp_executeSingleReport:test_InvalidSourcePoolAddress_Success() (gas: 475599)
-OffRamp_executeSingleReport:test_ManualExecutionNotYetEnabled_Revert() (gas: 54456)
-OffRamp_executeSingleReport:test_MismatchingDestChainSelector_Revert() (gas: 35904)
-OffRamp_executeSingleReport:test_MismatchingOnRampRoot_Revert() (gas: 154426)
-OffRamp_executeSingleReport:test_NonExistingSourceChain_Revert() (gas: 35337)
-OffRamp_executeSingleReport:test_ReceiverError_Success() (gas: 184865)
-OffRamp_executeSingleReport:test_RetryFailedMessageWithoutManualExecution_Revert() (gas: 196122)
-OffRamp_executeSingleReport:test_RootNotCommitted_Revert() (gas: 48073)
-OffRamp_executeSingleReport:test_RouterYULCall_Revert() (gas: 444686)
-OffRamp_executeSingleReport:test_SingleMessageNoTokensOtherChain_Success() (gas: 250335)
-OffRamp_executeSingleReport:test_SingleMessageNoTokensUnordered_Success() (gas: 187191)
-OffRamp_executeSingleReport:test_SingleMessageNoTokens_Success() (gas: 206771)
-OffRamp_executeSingleReport:test_SingleMessageToNonCCIPReceiver_Success() (gas: 263519)
-OffRamp_executeSingleReport:test_SingleMessagesNoTokensSuccess_gas() (gas: 138408)
-OffRamp_executeSingleReport:test_SkippedIncorrectNonceStillExecutes_Success() (gas: 409328)
-OffRamp_executeSingleReport:test_SkippedIncorrectNonce_Success() (gas: 65876)
-OffRamp_executeSingleReport:test_TokenDataMismatch_Revert() (gas: 80909)
-OffRamp_executeSingleReport:test_TwoMessagesWithTokensAndGE_Success() (gas: 566299)
-OffRamp_executeSingleReport:test_TwoMessagesWithTokensSuccess_gas() (gas: 517689)
-OffRamp_executeSingleReport:test_UnexpectedTokenData_Revert() (gas: 35742)
-OffRamp_executeSingleReport:test_UnhealthySingleChainCurse_Revert() (gas: 517721)
-OffRamp_executeSingleReport:test_Unhealthy_Revert() (gas: 515089)
-OffRamp_executeSingleReport:test_WithCurseOnAnotherSourceChain_Success() (gas: 485207)
-OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessageUnordered_Success() (gas: 133513)
-OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessage_Success() (gas: 162713)
-OffRamp_getExecutionState:test_FillExecutionState_Success() (gas: 3674540)
-OffRamp_getExecutionState:test_GetDifferentChainExecutionState_Success() (gas: 118375)
-OffRamp_getExecutionState:test_GetExecutionState_Success() (gas: 87586)
-OffRamp_manuallyExecute:test_ManualExecGasLimitMismatchSingleReport_Revert() (gas: 75635)
-OffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 26471)
-OffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 168604)
-OffRamp_manuallyExecute:test_manuallyExecute_FailedTx_Revert() (gas: 205435)
-OffRamp_manuallyExecute:test_manuallyExecute_ForkedChain_Revert() (gas: 26014)
-OffRamp_manuallyExecute:test_manuallyExecute_GasLimitMismatchMultipleReports_Revert() (gas: 152948)
-OffRamp_manuallyExecute:test_manuallyExecute_LowGasLimit_Success() (gas: 518487)
-OffRamp_manuallyExecute:test_manuallyExecute_ReentrancyFails_Success() (gas: 2295740)
-OffRamp_manuallyExecute:test_manuallyExecute_Success() (gas: 205788)
-OffRamp_manuallyExecute:test_manuallyExecute_WithGasOverride_Success() (gas: 206365)
-OffRamp_manuallyExecute:test_manuallyExecute_WithMultiReportGasOverride_Success() (gas: 649321)
-OffRamp_manuallyExecute:test_manuallyExecute_WithPartialMessages_Success() (gas: 318903)
-OffRamp_releaseOrMintTokens:test_TokenHandlingError_Reverts() (gas: 164042)
-OffRamp_releaseOrMintTokens:test__releaseOrMintTokens_PoolIsNotAPool_Reverts() (gas: 23736)
-OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_InvalidDataLengthReturnData_Revert() (gas: 64484)
-OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_InvalidEVMAddress_Revert() (gas: 39516)
-OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_PoolDoesNotSupportDest_Reverts() (gas: 81512)
-OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_Success() (gas: 176140)
-OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_destDenominatedDecimals_Success() (gas: 189342)
-OffRamp_resetUnblessedRoots:test_OnlyOwner_Revert() (gas: 11379)
-OffRamp_resetUnblessedRoots:test_ResetUnblessedRoots_Success() (gas: 215398)
-OffRamp_setDynamicConfig:test_NonOwner_Revert() (gas: 14140)
-OffRamp_setDynamicConfig:test_PriceRegistryZeroAddress_Revert() (gas: 11660)
-OffRamp_setDynamicConfig:test_SetDynamicConfigWithValidator_Success() (gas: 49203)
-OffRamp_setDynamicConfig:test_SetDynamicConfig_Success() (gas: 27147)
-OffRamp_trialExecute:test_RateLimitError_Success() (gas: 221780)
-OffRamp_trialExecute:test_TokenHandlingErrorIsCaught_Success() (gas: 230403)
-OffRamp_trialExecute:test_TokenPoolIsNotAContract_Success() (gas: 297574)
-OffRamp_trialExecute:test_trialExecute_Success() (gas: 279978)
-OffRamp_verify:test_Blessed_Success() (gas: 176620)
-OffRamp_verify:test_NotBlessedWrongChainSelector_Success() (gas: 178688)
-OffRamp_verify:test_NotBlessed_Success() (gas: 141549)
+OffRamp_commit:test_InvalidInterval_Revert() (gas: 59778)
+OffRamp_commit:test_InvalidRootRevert() (gas: 58858)
+OffRamp_commit:test_NoConfigWithOtherConfigPresent_Revert() (gas: 6560573)
+OffRamp_commit:test_NoConfig_Revert() (gas: 6143711)
+OffRamp_commit:test_OnlyGasPriceUpdates_Success() (gas: 106317)
+OffRamp_commit:test_OnlyPriceUpdateStaleReport_Revert() (gas: 116369)
+OffRamp_commit:test_OnlyTokenPriceUpdates_Success() (gas: 106338)
+OffRamp_commit:test_PriceSequenceNumberCleared_Success() (gas: 351652)
+OffRamp_commit:test_ReportAndPriceUpdate_Success() (gas: 159342)
+OffRamp_commit:test_ReportOnlyRootSuccess_gas() (gas: 136480)
+OffRamp_commit:test_RootAlreadyCommitted_Revert() (gas: 136880)
+OffRamp_commit:test_SourceChainNotEnabled_Revert() (gas: 59126)
+OffRamp_commit:test_StaleReportWithRoot_Success() (gas: 225582)
+OffRamp_commit:test_UnauthorizedTransmitter_Revert() (gas: 117632)
+OffRamp_commit:test_Unhealthy_Revert() (gas: 77674)
+OffRamp_commit:test_ValidPriceUpdateThenStaleReportWithRoot_Success() (gas: 205066)
+OffRamp_commit:test_WrongConfigWithoutSigners_Revert() (gas: 6554962)
+OffRamp_commit:test_ZeroEpochAndRound_Revert() (gas: 47832)
+OffRamp_constructor:test_Constructor_Success() (gas: 6147616)
+OffRamp_constructor:test_SourceChainSelector_Revert() (gas: 137128)
+OffRamp_constructor:test_ZeroChainSelector_Revert() (gas: 103845)
+OffRamp_constructor:test_ZeroNonceManager_Revert() (gas: 101716)
+OffRamp_constructor:test_ZeroOnRampAddress_Revert() (gas: 139680)
+OffRamp_constructor:test_ZeroRMNProxy_Revert() (gas: 101593)
+OffRamp_constructor:test_ZeroTokenAdminRegistry_Revert() (gas: 101660)
+OffRamp_execute:test_IncorrectArrayType_Revert() (gas: 17305)
+OffRamp_execute:test_LargeBatch_Success() (gas: 1828972)
+OffRamp_execute:test_MultipleReportsWithPartialValidationFailures_Success() (gas: 358063)
+OffRamp_execute:test_MultipleReports_Success() (gas: 285617)
+OffRamp_execute:test_NoConfigWithOtherConfigPresent_Revert() (gas: 6611685)
+OffRamp_execute:test_NoConfig_Revert() (gas: 6194563)
+OffRamp_execute:test_NonArray_Revert() (gas: 27809)
+OffRamp_execute:test_SingleReport_Success() (gas: 175620)
+OffRamp_execute:test_UnauthorizedTransmitter_Revert() (gas: 147848)
+OffRamp_execute:test_WrongConfigWithSigners_Revert() (gas: 6973803)
+OffRamp_execute:test_ZeroReports_Revert() (gas: 17225)
+OffRamp_executeSingleMessage:test_MessageSender_Revert() (gas: 18257)
+OffRamp_executeSingleMessage:test_NonContractWithTokens_Success() (gas: 249037)
+OffRamp_executeSingleMessage:test_NonContract_Success() (gas: 20517)
+OffRamp_executeSingleMessage:test_TokenHandlingError_Revert() (gas: 210176)
+OffRamp_executeSingleMessage:test_ZeroGasDONExecution_Revert() (gas: 48779)
+OffRamp_executeSingleMessage:test_executeSingleMessage_NoTokens_Success() (gas: 48302)
+OffRamp_executeSingleMessage:test_executeSingleMessage_WithFailingValidationNoRouterCall_Revert() (gas: 229565)
+OffRamp_executeSingleMessage:test_executeSingleMessage_WithFailingValidation_Revert() (gas: 86203)
+OffRamp_executeSingleMessage:test_executeSingleMessage_WithTokens_Success() (gas: 280859)
+OffRamp_executeSingleMessage:test_executeSingleMessage_WithValidation_Success() (gas: 92437)
+OffRamp_executeSingleReport:test_DisabledSourceChain_Revert() (gas: 35104)
+OffRamp_executeSingleReport:test_EmptyReport_Revert() (gas: 23923)
+OffRamp_executeSingleReport:test_InvalidSourcePoolAddress_Success() (gas: 492333)
+OffRamp_executeSingleReport:test_ManualExecutionNotYetEnabled_Revert() (gas: 54457)
+OffRamp_executeSingleReport:test_MismatchingDestChainSelector_Revert() (gas: 35927)
+OffRamp_executeSingleReport:test_MismatchingOnRampRoot_Revert() (gas: 154493)
+OffRamp_executeSingleReport:test_NonExistingSourceChain_Revert() (gas: 35338)
+OffRamp_executeSingleReport:test_ReceiverError_Success() (gas: 187911)
+OffRamp_executeSingleReport:test_RetryFailedMessageWithoutManualExecution_Revert() (gas: 199215)
+OffRamp_executeSingleReport:test_RootNotCommitted_Revert() (gas: 48096)
+OffRamp_executeSingleReport:test_RouterYULCall_Revert() (gas: 447759)
+OffRamp_executeSingleReport:test_SingleMessageNoTokensOtherChain_Success() (gas: 251078)
+OffRamp_executeSingleReport:test_SingleMessageNoTokensUnordered_Success() (gas: 193345)
+OffRamp_executeSingleReport:test_SingleMessageNoTokens_Success() (gas: 212938)
+OffRamp_executeSingleReport:test_SingleMessageToNonCCIPReceiver_Success() (gas: 266576)
+OffRamp_executeSingleReport:test_SingleMessagesNoTokensSuccess_gas() (gas: 141191)
+OffRamp_executeSingleReport:test_SkippedIncorrectNonceStillExecutes_Success() (gas: 423378)
+OffRamp_executeSingleReport:test_SkippedIncorrectNonce_Success() (gas: 65877)
+OffRamp_executeSingleReport:test_TokenDataMismatch_Revert() (gas: 80932)
+OffRamp_executeSingleReport:test_TwoMessagesWithTokensAndGE_Success() (gas: 587410)
+OffRamp_executeSingleReport:test_TwoMessagesWithTokensSuccess_gas() (gas: 535220)
+OffRamp_executeSingleReport:test_UnexpectedTokenData_Revert() (gas: 35743)
+OffRamp_executeSingleReport:test_UnhealthySingleChainCurse_Revert() (gas: 532474)
+OffRamp_executeSingleReport:test_Unhealthy_Revert() (gas: 529798)
+OffRamp_executeSingleReport:test_WithCurseOnAnotherSourceChain_Success() (gas: 495040)
+OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessageUnordered_Success() (gas: 136580)
+OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessage_Success() (gas: 165799)
+OffRamp_getExecutionState:test_FillExecutionState_Success() (gas: 3742124)
+OffRamp_getExecutionState:test_GetDifferentChainExecutionState_Success() (gas: 118836)
+OffRamp_getExecutionState:test_GetExecutionState_Success() (gas: 88048)
+OffRamp_manuallyExecute:test_ManualExecGasLimitMismatchSingleReport_Revert() (gas: 75551)
+OffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 26439)
+OffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 171639)
+OffRamp_manuallyExecute:test_manuallyExecute_FailedTx_Revert() (gas: 205796)
+OffRamp_manuallyExecute:test_manuallyExecute_ForkedChain_Revert() (gas: 25993)
+OffRamp_manuallyExecute:test_manuallyExecute_GasLimitMismatchMultipleReports_Revert() (gas: 152822)
+OffRamp_manuallyExecute:test_manuallyExecute_LowGasLimit_Success() (gas: 524603)
+OffRamp_manuallyExecute:test_manuallyExecute_ReentrancyFails_Success() (gas: 2388943)
+OffRamp_manuallyExecute:test_manuallyExecute_Success() (gas: 208553)
+OffRamp_manuallyExecute:test_manuallyExecute_WithGasOverride_Success() (gas: 219343)
+OffRamp_manuallyExecute:test_manuallyExecute_WithMultiReportGasOverride_Success() (gas: 663643)
+OffRamp_manuallyExecute:test_manuallyExecute_WithPartialMessages_Success() (gas: 330148)
+OffRamp_releaseOrMintTokens:test_TokenHandlingError_Reverts() (gas: 165822)
+OffRamp_releaseOrMintTokens:test__releaseOrMintTokens_PoolIsNotAPool_Reverts() (gas: 24603)
+OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_InvalidDataLengthReturnData_Revert() (gas: 66285)
+OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_InvalidEVMAddress_Revert() (gas: 41316)
+OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_PoolDoesNotSupportDest_Reverts() (gas: 83291)
+OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_Success() (gas: 177934)
+OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_destDenominatedDecimals_Success() (gas: 191136)
+OffRamp_resetUnblessedRoots:test_OnlyOwner_Revert() (gas: 11423)
+OffRamp_resetUnblessedRoots:test_ResetUnblessedRoots_Success() (gas: 215373)
+OffRamp_setDynamicConfig:test_FeeQuoterZeroAddress_Revert() (gas: 11585)
+OffRamp_setDynamicConfig:test_NonOwner_Revert() (gas: 14152)
+OffRamp_setDynamicConfig:test_SetDynamicConfigWithValidator_Success() (gas: 49115)
+OffRamp_setDynamicConfig:test_SetDynamicConfig_Success() (gas: 27037)
+OffRamp_trialExecute:test_RateLimitError_Success() (gas: 225795)
+OffRamp_trialExecute:test_TokenHandlingErrorIsCaught_Success() (gas: 234416)
+OffRamp_trialExecute:test_TokenPoolIsNotAContract_Success() (gas: 309206)
+OffRamp_trialExecute:test_trialExecute_Success() (gas: 283994)
+OffRamp_verify:test_Blessed_Success() (gas: 176664)
+OffRamp_verify:test_NotBlessedWrongChainSelector_Success() (gas: 178754)
+OffRamp_verify:test_NotBlessed_Success() (gas: 141593)
 OffRamp_verify:test_TooManyLeaves_Revert() (gas: 51510)
-OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy_Success() (gas: 390322)
-OnRamp_applyDestChainConfigUpdates:test_ApplyDestChainConfigUpdates_Success() (gas: 63649)
-OnRamp_applyDestChainConfigUpdates:test_ApplyDestChainConfigUpdates_WithInalidChainSelector_Revert() (gas: 13308)
-OnRamp_constructor:test_Constructor_InvalidConfigChainSelectorEqZero_Revert() (gas: 94175)
-OnRamp_constructor:test_Constructor_InvalidConfigNonceManagerEqAddressZero_Revert() (gas: 92092)
-OnRamp_constructor:test_Constructor_InvalidConfigRMNProxyEqAddressZero_Revert() (gas: 97113)
-OnRamp_constructor:test_Constructor_InvalidConfigTokenAdminRegistryEqAddressZero_Revert() (gas: 92150)
-OnRamp_constructor:test_Constructor_Success() (gas: 2384439)
-OnRamp_forwardFromRouter:test_CannotSendZeroTokens_Revert() (gas: 71940)
-OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2AllowOutOfOrderTrue_Success() (gas: 112003)
-OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2_Success() (gas: 142773)
-OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessCustomExtraArgs() (gas: 142349)
-OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessEmptyExtraArgs() (gas: 140526)
-OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessLegacyExtraArgs() (gas: 142579)
-OnRamp_forwardFromRouter:test_ForwardFromRouter_Success() (gas: 141948)
-OnRamp_forwardFromRouter:test_ForwardFromRouter_Success_ConfigurableSourceRouter() (gas: 134391)
-OnRamp_forwardFromRouter:test_InvalidExtraArgsTag_Revert() (gas: 26316)
-OnRamp_forwardFromRouter:test_MessageValidationError_Revert() (gas: 133253)
-OnRamp_forwardFromRouter:test_MesssageFeeTooHigh_Revert() (gas: 24382)
-OnRamp_forwardFromRouter:test_OriginalSender_Revert() (gas: 12872)
-OnRamp_forwardFromRouter:test_Paused_Revert() (gas: 32033)
-OnRamp_forwardFromRouter:test_Permissions_Revert() (gas: 15762)
-OnRamp_forwardFromRouter:test_ShouldIncrementNonceOnlyOnOrdered_Success() (gas: 179668)
-OnRamp_forwardFromRouter:test_ShouldIncrementSeqNumAndNonce_Success() (gas: 205937)
-OnRamp_forwardFromRouter:test_ShouldStoreLinkFees() (gas: 121859)
-OnRamp_forwardFromRouter:test_ShouldStoreNonLinkFees() (gas: 143149)
-OnRamp_forwardFromRouter:test_SourceTokenDataTooLarge_Revert() (gas: 3872828)
-OnRamp_forwardFromRouter:test_UnsupportedToken_Revert() (gas: 108568)
-OnRamp_forwardFromRouter:test_forwardFromRouter_UnsupportedToken_Revert() (gas: 73997)
-OnRamp_forwardFromRouter:test_forwardFromRouter_WithValidation_Success() (gas: 262774)
-OnRamp_getFee:test_EmptyMessage_Success() (gas: 104647)
-OnRamp_getFee:test_EnforceOutOfOrder_Revert() (gas: 74120)
-OnRamp_getFee:test_SingleTokenMessage_Success() (gas: 119979)
-OnRamp_getFee:test_Unhealthy_Revert() (gas: 43679)
+OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy_Success() (gas: 390336)
+OnRamp_allowListConfigUpdates:test_applyAllowList_Revert() (gas: 66509)
+OnRamp_allowListConfigUpdates:test_applyAllowList_Success() (gas: 323566)
+OnRamp_applyDestChainConfigUpdates:test_ApplyDestChainConfigUpdates_Success() (gas: 64501)
+OnRamp_applyDestChainConfigUpdates:test_ApplyDestChainConfigUpdates_WithInvalidChainSelector_Revert() (gas: 13242)
+OnRamp_constructor:test_Constructor_InvalidConfigChainSelectorEqZero_Revert() (gas: 94878)
+OnRamp_constructor:test_Constructor_InvalidConfigNonceManagerEqAddressZero_Revert() (gas: 92812)
+OnRamp_constructor:test_Constructor_InvalidConfigRMNProxyEqAddressZero_Revert() (gas: 97827)
+OnRamp_constructor:test_Constructor_InvalidConfigTokenAdminRegistryEqAddressZero_Revert() (gas: 92870)
+OnRamp_constructor:test_Constructor_Success() (gas: 2866937)
+OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2AllowOutOfOrderTrue_Success() (gas: 115250)
+OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2_Success() (gas: 146019)
+OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessCustomExtraArgs() (gas: 145615)
+OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessEmptyExtraArgs() (gas: 143816)
+OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessLegacyExtraArgs() (gas: 145847)
+OnRamp_forwardFromRouter:test_ForwardFromRouter_Success() (gas: 145216)
+OnRamp_forwardFromRouter:test_ForwardFromRouter_Success_ConfigurableSourceRouter() (gas: 140359)
+OnRamp_forwardFromRouter:test_InvalidExtraArgsTag_Revert() (gas: 28810)
+OnRamp_forwardFromRouter:test_MessageValidationError_Revert() (gas: 138683)
+OnRamp_forwardFromRouter:test_MesssageFeeTooHigh_Revert() (gas: 26910)
+OnRamp_forwardFromRouter:test_MultiCannotSendZeroTokens_Revert() (gas: 74456)
+OnRamp_forwardFromRouter:test_OriginalSender_Revert() (gas: 12918)
+OnRamp_forwardFromRouter:test_Paused_Revert() (gas: 37224)
+OnRamp_forwardFromRouter:test_Permissions_Revert() (gas: 18179)
+OnRamp_forwardFromRouter:test_ShouldIncrementNonceOnlyOnOrdered_Success() (gas: 185252)
+OnRamp_forwardFromRouter:test_ShouldIncrementSeqNumAndNonce_Success() (gas: 211543)
+OnRamp_forwardFromRouter:test_ShouldStoreLinkFees() (gas: 125128)
+OnRamp_forwardFromRouter:test_ShouldStoreNonLinkFees() (gas: 146530)
+OnRamp_forwardFromRouter:test_SourceTokenDataTooLarge_Revert() (gas: 3894232)
+OnRamp_forwardFromRouter:test_UnAllowedOriginalSender_Revert() (gas: 18609)
+OnRamp_forwardFromRouter:test_UnsupportedToken_Revert() (gas: 111118)
+OnRamp_forwardFromRouter:test_forwardFromRouter_UnsupportedToken_Revert() (gas: 76545)
+OnRamp_forwardFromRouter:test_forwardFromRouter_WithValidation_Success() (gas: 281240)
+OnRamp_getFee:test_EmptyMessage_Success() (gas: 110107)
+OnRamp_getFee:test_EnforceOutOfOrder_Revert() (gas: 75610)
+OnRamp_getFee:test_GetFeeOfZeroForTokenMessage_Success() (gas: 95456)
+OnRamp_getFee:test_NotAFeeTokenButPricedToken_Revert() (gas: 41814)
+OnRamp_getFee:test_SingleTokenMessage_Success() (gas: 125476)
+OnRamp_getFee:test_Unhealthy_Revert() (gas: 43669)
 OnRamp_getSupportedTokens:test_GetSupportedTokens_Revert() (gas: 10438)
-OnRamp_getTokenPool:test_GetTokenPool_Success() (gas: 35270)
-OnRamp_setDynamicConfig:test_SetConfigInvalidConfigFeeAggregatorEqAddressZero_Revert() (gas: 11155)
-OnRamp_setDynamicConfig:test_SetConfigInvalidConfigPriceRegistryEqAddressZero_Revert() (gas: 12740)
-OnRamp_setDynamicConfig:test_SetConfigInvalidConfig_Revert() (gas: 11112)
-OnRamp_setDynamicConfig:test_SetConfigOnlyOwner_Revert() (gas: 15939)
-OnRamp_setDynamicConfig:test_SetDynamicConfig_Success() (gas: 51996)
-OnRamp_withdrawFeeTokens:test_WithdrawFeeTokens_Success() (gas: 97236)
-PingPong_ccipReceive:test_CcipReceive_Success() (gas: 150175)
+OnRamp_getTokenPool:test_GetTokenPool_Success() (gas: 35204)
+OnRamp_setDynamicConfig:test_SetConfigInvalidConfigFeeAggregatorEqAddressZero_Revert() (gas: 11402)
+OnRamp_setDynamicConfig:test_SetConfigInvalidConfigFeeQuoterEqAddressZero_Revert() (gas: 13001)
+OnRamp_setDynamicConfig:test_SetConfigInvalidConfig_Revert() (gas: 11359)
+OnRamp_setDynamicConfig:test_SetConfigOnlyOwner_Revert() (gas: 16385)
+OnRamp_setDynamicConfig:test_SetDynamicConfig_Success() (gas: 55321)
+OnRamp_withdrawFeeTokens:test_WithdrawFeeTokens_Success() (gas: 97107)
+PingPong_ccipReceive:test_CcipReceive_Success() (gas: 152669)
 PingPong_plumbing:test_OutOfOrderExecution_Success() (gas: 20277)
 PingPong_plumbing:test_Pausing_Success() (gas: 17777)
-PingPong_startPingPong:test_StartPingPong_With_OOO_Success() (gas: 163199)
-PingPong_startPingPong:test_StartPingPong_With_Sequenced_Ordered_Success() (gas: 182611)
-PriceRegistry_applyDestChainConfigUpdates:test_InvalidChainFamilySelector_Revert() (gas: 16725)
-PriceRegistry_applyDestChainConfigUpdates:test_InvalidDestBytesOverhead_Revert() (gas: 16816)
-PriceRegistry_applyDestChainConfigUpdates:test_InvalidDestChainConfigDestChainSelectorEqZero_Revert() (gas: 16617)
-PriceRegistry_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesDefaultTxGasLimitEqZero_Revert() (gas: 16681)
-PriceRegistry_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesDefaultTxGasLimitGtMaxPerMessageGasLimit_Revert() (gas: 40971)
-PriceRegistry_applyDestChainConfigUpdates:test_applyDestChainConfigUpdatesZeroIntput_Success() (gas: 12341)
-PriceRegistry_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates_Success() (gas: 139678)
-PriceRegistry_applyFeeTokensUpdates:test_ApplyFeeTokensUpdates_Success() (gas: 80108)
-PriceRegistry_applyFeeTokensUpdates:test_OnlyCallableByOwner_Revert() (gas: 12603)
-PriceRegistry_applyPremiumMultiplierWeiPerEthUpdates:test_OnlyCallableByOwnerOrAdmin_Revert() (gas: 11465)
-PriceRegistry_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiPerEthUpdatesMultipleTokens_Success() (gas: 54149)
-PriceRegistry_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiPerEthUpdatesSingleToken_Success() (gas: 44835)
-PriceRegistry_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiPerEthUpdatesZeroInput() (gas: 12301)
-PriceRegistry_applyTokenTransferFeeConfigUpdates:test_ApplyTokenTransferFeeConfig_Success() (gas: 86926)
-PriceRegistry_applyTokenTransferFeeConfigUpdates:test_ApplyTokenTransferFeeZeroInput() (gas: 13089)
-PriceRegistry_applyTokenTransferFeeConfigUpdates:test_InvalidDestBytesOverhead_Revert() (gas: 17071)
-PriceRegistry_applyTokenTransferFeeConfigUpdates:test_OnlyCallableByOwnerOrAdmin_Revert() (gas: 12240)
-PriceRegistry_constructor:test_InvalidLinkTokenEqZeroAddress_Revert() (gas: 101316)
-PriceRegistry_constructor:test_InvalidMaxFeeJuelsPerMsg_Revert() (gas: 105666)
-PriceRegistry_constructor:test_InvalidStalenessThreshold_Revert() (gas: 105719)
-PriceRegistry_constructor:test_Setup_Success() (gas: 5194297)
-PriceRegistry_convertTokenAmount:test_ConvertTokenAmount_Success() (gas: 72751)
-PriceRegistry_convertTokenAmount:test_LinkTokenNotSupported_Revert() (gas: 30981)
-PriceRegistry_getDataAvailabilityCost:test_EmptyMessageCalculatesDataAvailabilityCost_Success() (gas: 95677)
-PriceRegistry_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCostUnsupportedDestChainSelector_Success() (gas: 14636)
-PriceRegistry_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCost_Success() (gas: 20659)
-PriceRegistry_getTokenAndGasPrices:test_GetFeeTokenAndGasPrices_Success() (gas: 70449)
-PriceRegistry_getTokenAndGasPrices:test_StaleGasPrice_Revert() (gas: 16838)
-PriceRegistry_getTokenAndGasPrices:test_UnsupportedChain_Revert() (gas: 16140)
-PriceRegistry_getTokenAndGasPrices:test_ZeroGasPrice_Success() (gas: 45734)
-PriceRegistry_getTokenPrice:test_GetTokenPriceFromFeed_Success() (gas: 62308)
-PriceRegistry_getTokenPrices:test_GetTokenPrices_Success() (gas: 84796)
-PriceRegistry_getTokenTransferCost:test_CustomTokenBpsFee_Success() (gas: 41277)
-PriceRegistry_getTokenTransferCost:test_FeeTokenBpsFee_Success() (gas: 34727)
-PriceRegistry_getTokenTransferCost:test_LargeTokenTransferChargesMaxFeeAndGas_Success() (gas: 27801)
-PriceRegistry_getTokenTransferCost:test_MixedTokenTransferFee_Success() (gas: 101840)
-PriceRegistry_getTokenTransferCost:test_NoTokenTransferChargesZeroFee_Success() (gas: 20398)
-PriceRegistry_getTokenTransferCost:test_SmallTokenTransferChargesMinFeeAndGas_Success() (gas: 27676)
-PriceRegistry_getTokenTransferCost:test_ZeroAmountTokenTransferChargesMinFeeAndGas_Success() (gas: 27632)
-PriceRegistry_getTokenTransferCost:test_ZeroFeeConfigChargesMinFee_Success() (gas: 40058)
-PriceRegistry_getTokenTransferCost:test_getTokenTransferCost_selfServeUsesDefaults_Success() (gas: 29359)
-PriceRegistry_getValidatedFee:test_DestinationChainNotEnabled_Revert() (gas: 18248)
-PriceRegistry_getValidatedFee:test_EmptyMessage_Success() (gas: 81644)
-PriceRegistry_getValidatedFee:test_EnforceOutOfOrder_Revert() (gas: 55241)
-PriceRegistry_getValidatedFee:test_HighGasMessage_Success() (gas: 238106)
-PriceRegistry_getValidatedFee:test_InvalidEVMAddress_Revert() (gas: 20016)
-PriceRegistry_getValidatedFee:test_MessageGasLimitTooHigh_Revert() (gas: 31820)
-PriceRegistry_getValidatedFee:test_MessageTooLarge_Revert() (gas: 97759)
-PriceRegistry_getValidatedFee:test_MessageWithDataAndTokenTransfer_Success() (gas: 143549)
-PriceRegistry_getValidatedFee:test_NotAFeeToken_Revert() (gas: 29480)
-PriceRegistry_getValidatedFee:test_SingleTokenMessage_Success() (gas: 112551)
-PriceRegistry_getValidatedFee:test_TooManyTokens_Revert() (gas: 20152)
-PriceRegistry_getValidatedFee:test_ZeroDataAvailabilityMultiplier_Success() (gas: 63052)
-PriceRegistry_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedErc20Above18Decimals_Success() (gas: 2094595)
-PriceRegistry_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedErc20Below18Decimals_Success() (gas: 2094553)
-PriceRegistry_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFeedAt0Decimals_Success() (gas: 2074672)
-PriceRegistry_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFeedAt18Decimals_Success() (gas: 2094327)
-PriceRegistry_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFlippedDecimals_Success() (gas: 2094531)
-PriceRegistry_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedMaxInt224Value_Success() (gas: 2094343)
-PriceRegistry_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedOverStalenessPeriod_Success() (gas: 62060)
-PriceRegistry_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeed_Success() (gas: 61940)
-PriceRegistry_getValidatedTokenPrice:test_GetValidatedTokenPrice_Success() (gas: 61020)
-PriceRegistry_getValidatedTokenPrice:test_OverflowFeedPrice_Revert() (gas: 2094030)
-PriceRegistry_getValidatedTokenPrice:test_StaleFeeToken_Success() (gas: 61547)
-PriceRegistry_getValidatedTokenPrice:test_TokenNotSupportedFeed_Revert() (gas: 109176)
-PriceRegistry_getValidatedTokenPrice:test_TokenNotSupported_Revert() (gas: 13841)
-PriceRegistry_getValidatedTokenPrice:test_UnderflowFeedPrice_Revert() (gas: 2092692)
-PriceRegistry_onReport:test_OnReport_StaleUpdate_Revert() (gas: 43415)
-PriceRegistry_onReport:test_onReport_InvalidForwarder_Reverts() (gas: 23261)
-PriceRegistry_onReport:test_onReport_Success() (gas: 80702)
-PriceRegistry_onReport:test_onReport_UnsupportedToken_Reverts() (gas: 26681)
-PriceRegistry_parseEVMExtraArgsFromBytes:test_EVMExtraArgsDefault_Success() (gas: 17316)
-PriceRegistry_parseEVMExtraArgsFromBytes:test_EVMExtraArgsEnforceOutOfOrder_Revert() (gas: 21410)
-PriceRegistry_parseEVMExtraArgsFromBytes:test_EVMExtraArgsGasLimitTooHigh_Revert() (gas: 18507)
-PriceRegistry_parseEVMExtraArgsFromBytes:test_EVMExtraArgsInvalidExtraArgsTag_Revert() (gas: 18031)
-PriceRegistry_parseEVMExtraArgsFromBytes:test_EVMExtraArgsV1_Success() (gas: 18408)
-PriceRegistry_parseEVMExtraArgsFromBytes:test_EVMExtraArgsV2_Success() (gas: 18525)
-PriceRegistry_processMessageArgs:test_InvalidExtraArgs_Revert() (gas: 18328)
-PriceRegistry_processMessageArgs:test_MalformedEVMExtraArgs_Revert() (gas: 18874)
-PriceRegistry_processMessageArgs:test_MessageFeeTooHigh_Revert() (gas: 16382)
-PriceRegistry_processMessageArgs:test_WitEVMExtraArgsV2_Success() (gas: 26303)
-PriceRegistry_processMessageArgs:test_WithConvertedTokenAmount_Success() (gas: 32432)
-PriceRegistry_processMessageArgs:test_WithEVMExtraArgsV1_Success() (gas: 25915)
-PriceRegistry_processMessageArgs:test_WithEmptyEVMExtraArgs_Success() (gas: 23730)
-PriceRegistry_processMessageArgs:test_WithLinkTokenAmount_Success() (gas: 17342)
-PriceRegistry_updatePrices:test_OnlyCallableByUpdater_Revert() (gas: 12080)
-PriceRegistry_updatePrices:test_OnlyGasPrice_Success() (gas: 23621)
-PriceRegistry_updatePrices:test_OnlyTokenPrice_Success() (gas: 30593)
-PriceRegistry_updatePrices:test_UpdatableByAuthorizedCaller_Success() (gas: 75937)
-PriceRegistry_updatePrices:test_UpdateMultiplePrices_Success() (gas: 151455)
-PriceRegistry_updateTokenPriceFeeds:test_FeedNotUpdated() (gas: 50633)
-PriceRegistry_updateTokenPriceFeeds:test_FeedUnset_Success() (gas: 63662)
-PriceRegistry_updateTokenPriceFeeds:test_FeedUpdatedByNonOwner_Revert() (gas: 19998)
-PriceRegistry_updateTokenPriceFeeds:test_MultipleFeedUpdate_Success() (gas: 88898)
-PriceRegistry_updateTokenPriceFeeds:test_SingleFeedUpdate_Success() (gas: 50817)
-PriceRegistry_updateTokenPriceFeeds:test_ZeroFeeds_Success() (gas: 12362)
-PriceRegistry_validateDestFamilyAddress:test_InvalidEVMAddressEncodePacked_Revert() (gas: 10572)
-PriceRegistry_validateDestFamilyAddress:test_InvalidEVMAddressPrecompiles_Revert() (gas: 3916546)
-PriceRegistry_validateDestFamilyAddress:test_InvalidEVMAddress_Revert() (gas: 10756)
-PriceRegistry_validateDestFamilyAddress:test_ValidEVMAddress_Success() (gas: 6660)
-PriceRegistry_validateDestFamilyAddress:test_ValidNonEVMAddress_Success() (gas: 6440)
-PriceRegistry_validatePoolReturnData:test_InvalidEVMAddressDestToken_Revert() (gas: 35479)
-PriceRegistry_validatePoolReturnData:test_SourceTokenDataTooLarge_Revert() (gas: 90819)
-PriceRegistry_validatePoolReturnData:test_TokenAmountArraysMismatching_Revert() (gas: 32771)
-PriceRegistry_validatePoolReturnData:test_WithSingleToken_Success() (gas: 31315)
+PingPong_startPingPong:test_StartPingPong_With_OOO_Success() (gas: 163187)
+PingPong_startPingPong:test_StartPingPong_With_Sequenced_Ordered_Success() (gas: 182599)
+RMNHome:test() (gas: 186)
 RMN_constructor:test_Constructor_Success() (gas: 48838)
 RMN_getRecordedCurseRelatedOps:test_OpsPostDeployment() (gas: 19666)
 RMN_lazyVoteToCurseUpdate_Benchmark:test_VoteToCurseLazilyRetain3VotersUponConfigChange_gas() (gas: 152152)
@@ -779,7 +807,7 @@ RMN_ownerUnbless:test_Unbless_Success() (gas: 74699)
 RMN_ownerUnvoteToCurse:test_CanBlessAndCurseAfterGlobalCurseIsLifted() (gas: 470965)
 RMN_ownerUnvoteToCurse:test_IsIdempotent() (gas: 397532)
 RMN_ownerUnvoteToCurse:test_NonOwner_Revert() (gas: 18591)
-RMN_ownerUnvoteToCurse:test_OwnerUnvoteToCurseSuccess_gas() (gas: 357403)
+RMN_ownerUnvoteToCurse:test_OwnerUnvoteToCurseSuccess_gas() (gas: 357400)
 RMN_ownerUnvoteToCurse:test_UnknownVoter_Revert() (gas: 32980)
 RMN_ownerUnvoteToCurse_Benchmark:test_OwnerUnvoteToCurse_1Voter_LiftsCurse_gas() (gas: 261985)
 RMN_permaBlessing:test_PermaBlessing() (gas: 202686)
@@ -787,7 +815,7 @@ RMN_setConfig:test_BlessVoterIsZeroAddress_Revert() (gas: 15494)
 RMN_setConfig:test_EitherThresholdIsZero_Revert() (gas: 21095)
 RMN_setConfig:test_NonOwner_Revert() (gas: 14713)
 RMN_setConfig:test_RepeatedAddress_Revert() (gas: 18213)
-RMN_setConfig:test_SetConfigSuccess_gas() (gas: 104204)
+RMN_setConfig:test_SetConfigSuccess_gas() (gas: 104022)
 RMN_setConfig:test_TotalWeightsSmallerThanEachThreshold_Revert() (gas: 30173)
 RMN_setConfig:test_VoteToBlessByEjectedVoter_Revert() (gas: 130303)
 RMN_setConfig:test_VotersLengthIsZero_Revert() (gas: 12128)
@@ -851,39 +879,39 @@ Router_applyRampUpdates:test_OffRampMismatch_Revert() (gas: 89288)
 Router_applyRampUpdates:test_OffRampUpdatesWithRouting() (gas: 10642128)
 Router_applyRampUpdates:test_OnRampDisable() (gas: 55913)
 Router_applyRampUpdates:test_OnlyOwner_Revert() (gas: 12311)
-Router_ccipSend:test_CCIPSendLinkFeeNoTokenSuccess_gas() (gas: 113886)
-Router_ccipSend:test_CCIPSendLinkFeeOneTokenSuccess_gas() (gas: 201342)
-Router_ccipSend:test_CCIPSendNativeFeeNoTokenSuccess_gas() (gas: 128533)
-Router_ccipSend:test_CCIPSendNativeFeeOneTokenSuccess_gas() (gas: 215991)
-Router_ccipSend:test_FeeTokenAmountTooLow_Revert() (gas: 66275)
+Router_ccipSend:test_CCIPSendLinkFeeNoTokenSuccess_gas() (gas: 113880)
+Router_ccipSend:test_CCIPSendLinkFeeOneTokenSuccess_gas() (gas: 201336)
+Router_ccipSend:test_CCIPSendNativeFeeNoTokenSuccess_gas() (gas: 128515)
+Router_ccipSend:test_CCIPSendNativeFeeOneTokenSuccess_gas() (gas: 215973)
+Router_ccipSend:test_FeeTokenAmountTooLow_Revert() (gas: 66269)
 Router_ccipSend:test_InvalidMsgValue() (gas: 31963)
-Router_ccipSend:test_NativeFeeTokenInsufficientValue() (gas: 68746)
-Router_ccipSend:test_NativeFeeTokenOverpay_Success() (gas: 173630)
-Router_ccipSend:test_NativeFeeTokenZeroValue() (gas: 56037)
-Router_ccipSend:test_NativeFeeToken_Success() (gas: 172224)
-Router_ccipSend:test_NonLinkFeeToken_Success() (gas: 242732)
+Router_ccipSend:test_NativeFeeTokenInsufficientValue() (gas: 68740)
+Router_ccipSend:test_NativeFeeTokenOverpay_Success() (gas: 173606)
+Router_ccipSend:test_NativeFeeTokenZeroValue() (gas: 56031)
+Router_ccipSend:test_NativeFeeToken_Success() (gas: 172200)
+Router_ccipSend:test_NonLinkFeeToken_Success() (gas: 242714)
 Router_ccipSend:test_UnsupportedDestinationChain_Revert() (gas: 24749)
 Router_ccipSend:test_WhenNotHealthy_Revert() (gas: 44724)
-Router_ccipSend:test_WrappedNativeFeeToken_Success() (gas: 174440)
-Router_ccipSend:test_ZeroFeeAndGasPrice_Success() (gas: 244856)
+Router_ccipSend:test_WrappedNativeFeeToken_Success() (gas: 174416)
+Router_ccipSend:test_ZeroFeeAndGasPrice_Success() (gas: 244854)
 Router_constructor:test_Constructor_Success() (gas: 13074)
 Router_getArmProxy:test_getArmProxy() (gas: 10561)
-Router_getFee:test_GetFeeSupportedChain_Success() (gas: 46464)
+Router_getFee:test_GetFeeSupportedChain_Success() (gas: 46458)
 Router_getFee:test_UnsupportedDestinationChain_Revert() (gas: 17138)
 Router_getSupportedTokens:test_GetSupportedTokens_Revert() (gas: 10460)
 Router_recoverTokens:test_RecoverTokensInvalidRecipient_Revert() (gas: 11316)
-Router_recoverTokens:test_RecoverTokensNoFunds_Revert() (gas: 17761)
+Router_recoverTokens:test_RecoverTokensNoFunds_Revert() (gas: 20261)
 Router_recoverTokens:test_RecoverTokensNonOwner_Revert() (gas: 11159)
 Router_recoverTokens:test_RecoverTokensValueReceiver_Revert() (gas: 422138)
-Router_recoverTokens:test_RecoverTokens_Success() (gas: 50437)
+Router_recoverTokens:test_RecoverTokens_Success() (gas: 52437)
 Router_routeMessage:test_AutoExec_Success() (gas: 42684)
 Router_routeMessage:test_ExecutionEvent_Success() (gas: 157980)
 Router_routeMessage:test_ManualExec_Success() (gas: 35381)
 Router_routeMessage:test_OnlyOffRamp_Revert() (gas: 25116)
 Router_routeMessage:test_WhenNotHealthy_Revert() (gas: 44724)
 Router_setWrappedNative:test_OnlyOwner_Revert() (gas: 10985)
-SelfFundedPingPong_ccipReceive:test_FundingIfNotANop_Revert() (gas: 53531)
-SelfFundedPingPong_ccipReceive:test_Funding_Success() (gas: 417002)
+SelfFundedPingPong_ccipReceive:test_FundingIfNotANop_Revert() (gas: 55531)
+SelfFundedPingPong_ccipReceive:test_Funding_Success() (gas: 419466)
 SelfFundedPingPong_setCountIncrBeforeFunding:test_setCountIncrBeforeFunding() (gas: 20151)
 TokenAdminRegistry_acceptAdminRole:test_acceptAdminRole_OnlyPendingAdministrator_Revert() (gas: 51085)
 TokenAdminRegistry_acceptAdminRole:test_acceptAdminRole_Success() (gas: 43947)
@@ -911,8 +939,8 @@ TokenPoolAndProxy:test_lockOrBurn_burnMint_Success() (gas: 6070353)
 TokenPoolAndProxy:test_lockOrBurn_burnWithFromMint_Success() (gas: 6101826)
 TokenPoolAndProxy:test_lockOrBurn_lockRelease_Success() (gas: 6319594)
 TokenPoolAndProxy:test_setPreviousPool_Success() (gas: 3387124)
-TokenPoolAndProxyMigration:test_tokenPoolMigration_Success_1_2() (gas: 6913796)
-TokenPoolAndProxyMigration:test_tokenPoolMigration_Success_1_4() (gas: 7097821)
+TokenPoolAndProxyMigration:test_tokenPoolMigration_Success_1_2() (gas: 6916278)
+TokenPoolAndProxyMigration:test_tokenPoolMigration_Success_1_4() (gas: 7100303)
 TokenPoolWithAllowList_applyAllowListUpdates:test_AllowListNotEnabled_Revert() (gas: 2209837)
 TokenPoolWithAllowList_applyAllowListUpdates:test_OnlyOwner_Revert() (gas: 12089)
 TokenPoolWithAllowList_applyAllowListUpdates:test_SetAllowListSkipsZero_Success() (gas: 23324)
@@ -941,16 +969,16 @@ TokenPool_setRemotePool:test_setRemotePool_NonExistentChain_Reverts() (gas: 1562
 TokenPool_setRemotePool:test_setRemotePool_OnlyOwner_Reverts() (gas: 13195)
 TokenPool_setRemotePool:test_setRemotePool_Success() (gas: 281912)
 TokenProxy_ccipSend:test_CcipSendGasShouldBeZero_Revert() (gas: 17109)
-TokenProxy_ccipSend:test_CcipSendInsufficientAllowance_Revert() (gas: 136228)
+TokenProxy_ccipSend:test_CcipSendInsufficientAllowance_Revert() (gas: 136222)
 TokenProxy_ccipSend:test_CcipSendInvalidToken_Revert() (gas: 15919)
-TokenProxy_ccipSend:test_CcipSendNative_Success() (gas: 245191)
+TokenProxy_ccipSend:test_CcipSendNative_Success() (gas: 245173)
 TokenProxy_ccipSend:test_CcipSendNoDataAllowed_Revert() (gas: 16303)
-TokenProxy_ccipSend:test_CcipSend_Success() (gas: 261568)
+TokenProxy_ccipSend:test_CcipSend_Success() (gas: 261558)
 TokenProxy_constructor:test_Constructor() (gas: 13812)
 TokenProxy_getFee:test_GetFeeGasShouldBeZero_Revert() (gas: 16827)
 TokenProxy_getFee:test_GetFeeInvalidToken_Revert() (gas: 12658)
 TokenProxy_getFee:test_GetFeeNoDataAllowed_Revert() (gas: 15849)
-TokenProxy_getFee:test_GetFee_Success() (gas: 86702)
+TokenProxy_getFee:test_GetFee_Success() (gas: 86690)
 USDCTokenPool__validateMessage:test_ValidateInvalidMessage_Revert() (gas: 25290)
 USDCTokenPool_lockOrBurn:test_CallerIsNotARampOnRouter_Revert() (gas: 35322)
 USDCTokenPool_lockOrBurn:test_LockOrBurnWithAllowList_Revert() (gas: 30073)
diff --git a/contracts/gas-snapshots/functions.gas-snapshot b/contracts/gas-snapshots/functions.gas-snapshot
index d7945f225e..b54662b868 100644
--- a/contracts/gas-snapshots/functions.gas-snapshot
+++ b/contracts/gas-snapshots/functions.gas-snapshot
@@ -45,7 +45,7 @@ FunctionsCoordinator_SetDONPublicKey:test_SetDONPublicKey_Success() (gas: 88970)
 FunctionsCoordinator_SetThresholdPublicKey:test_SetThresholdPublicKey_RevertNotOwner() (gas: 13892)
 FunctionsCoordinator_SetThresholdPublicKey:test_SetThresholdPublicKey_Success() (gas: 513165)
 FunctionsCoordinator_StartRequest:test_StartRequest_RevertIfNotRouter() (gas: 22736)
-FunctionsCoordinator_StartRequest:test_StartRequest_Success() (gas: 150172)
+FunctionsCoordinator_StartRequest:test_StartRequest_Success() (gas: 152672)
 FunctionsCoordinator__IsTransmitter:test__IsTransmitter_SuccessFound() (gas: 15106)
 FunctionsCoordinator__IsTransmitter:test__IsTransmitter_SuccessNotFound() (gas: 22938)
 FunctionsRequest_DEFAULT_BUFFER_SIZE:test_DEFAULT_BUFFER_SIZE() (gas: 3089)
@@ -200,7 +200,7 @@ FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfBlockedSender() (gas: 88990)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfInvalidSigner() (gas: 23619)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientContractIsNotSender() (gas: 1866552)
-FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientIsNotSender() (gas: 26025)
+FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientIsNotSender() (gas: 28525)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_SuccessIfAcceptingForContract() (gas: 1946965)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_SuccessIfAcceptingForSelf() (gas: 104509)
 FunctionsTermsOfServiceAllowList_BlockSender:test_BlockSender_RevertIfNotOwner() (gas: 15491)
@@ -230,10 +230,10 @@ FunctionsTermsOfServiceAllowList_UpdateConfig:test_UpdateConfig_Success() (gas:
 Gas_AcceptTermsOfService:test_AcceptTermsOfService_Gas() (gas: 84702)
 Gas_AddConsumer:test_AddConsumer_Gas() (gas: 79140)
 Gas_CreateSubscription:test_CreateSubscription_Gas() (gas: 73419)
-Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MaximumGas() (gas: 20717)
-Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MinimumGas() (gas: 20157)
-Gas_FulfillRequest_Success:test_FulfillRequest_Success_MaximumGas() (gas: 501339)
-Gas_FulfillRequest_Success:test_FulfillRequest_Success_MinimumGas() (gas: 202509)
-Gas_FundSubscription:test_FundSubscription_Gas() (gas: 38524)
-Gas_SendRequest:test_SendRequest_MaximumGas() (gas: 988895)
-Gas_SendRequest:test_SendRequest_MinimumGas() (gas: 181579)
\ No newline at end of file
+Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MaximumGas() (gas: 20562)
+Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MinimumGas() (gas: 20024)
+Gas_FulfillRequest_Success:test_FulfillRequest_Success_MaximumGas() (gas: 501184)
+Gas_FulfillRequest_Success:test_FulfillRequest_Success_MinimumGas() (gas: 202376)
+Gas_FundSubscription:test_FundSubscription_Gas() (gas: 38518)
+Gas_SendRequest:test_SendRequest_MaximumGas() (gas: 984338)
+Gas_SendRequest:test_SendRequest_MinimumGas() (gas: 181561)
\ No newline at end of file
diff --git a/contracts/gas-snapshots/l2ep.gas-snapshot b/contracts/gas-snapshots/l2ep.gas-snapshot
index 324cacfc02..42a9aa0b35 100644
--- a/contracts/gas-snapshots/l2ep.gas-snapshot
+++ b/contracts/gas-snapshots/l2ep.gas-snapshot
@@ -24,17 +24,9 @@ ArbitrumCrossDomainGovernor_TransferL1Ownership:test_CallableByL1Owner() (gas: 4
 ArbitrumCrossDomainGovernor_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 19312)
 ArbitrumCrossDomainGovernor_TransferL1Ownership:test_NotCallableByL2Owner() (gas: 18671)
 ArbitrumCrossDomainGovernor_TransferL1Ownership:test_NotCallableByNonOwners() (gas: 13219)
-ArbitrumSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForGetAnswer() (gas: 92790)
-ArbitrumSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForGetRoundData() (gas: 93351)
-ArbitrumSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForGetTimestamp() (gas: 92711)
-ArbitrumSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestAnswer() (gas: 90485)
-ArbitrumSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestRound() (gas: 90377)
-ArbitrumSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestRoundData() (gas: 90924)
-ArbitrumSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestTimestamp() (gas: 90362)
 ArbitrumSequencerUptimeFeed_AggregatorV3Interface:test_AggregatorV3Interface() (gas: 104994)
 ArbitrumSequencerUptimeFeed_AggregatorV3Interface:test_Return0WhenRoundDoesNotExistYet() (gas: 20033)
 ArbitrumSequencerUptimeFeed_Constants:test_InitialState() (gas: 8530)
-ArbitrumSequencerUptimeFeed_GasCosts:test_GasCosts() (gas: 99865)
 ArbitrumSequencerUptimeFeed_ProtectReadsOnAggregatorV2V3InterfaceFunctions:test_AggregatorV2V3InterfaceAllowReadsIfConsumingContractIsWhitelisted() (gas: 604414)
 ArbitrumSequencerUptimeFeed_ProtectReadsOnAggregatorV2V3InterfaceFunctions:test_AggregatorV2V3InterfaceDisallowReadsIfConsumingContractIsNotWhitelisted() (gas: 574476)
 ArbitrumSequencerUptimeFeed_UpdateStatus:test_IgnoreOutOfOrderUpdates() (gas: 99662)
@@ -68,27 +60,19 @@ OptimismCrossDomainGovernor_TransferL1Ownership:test_CallableByL1Owner() (gas: 4
 OptimismCrossDomainGovernor_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 28775)
 OptimismCrossDomainGovernor_TransferL1Ownership:test_NotCallableByL2Owner() (gas: 16482)
 OptimismCrossDomainGovernor_TransferL1Ownership:test_NotCallableByNonOwners() (gas: 11030)
-OptimismSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForGetAnswer() (gas: 59785)
-OptimismSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForGetRoundData() (gas: 60331)
-OptimismSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForGetTimestamp() (gas: 59640)
-OptimismSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestAnswer() (gas: 57577)
-OptimismSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestRound() (gas: 57463)
-OptimismSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestRoundData() (gas: 58005)
-OptimismSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestTimestamp() (gas: 57430)
-OptimismSequencerUptimeFeed_AggregatorV3Interface:test_AggregatorV3Interface() (gas: 71804)
+OptimismSequencerUptimeFeed_AggregatorV3Interface:test_AggregatorV3Interface() (gas: 74304)
 OptimismSequencerUptimeFeed_AggregatorV3Interface:test_RevertGetAnswerWhenRoundDoesNotExistYet() (gas: 17679)
 OptimismSequencerUptimeFeed_AggregatorV3Interface:test_RevertGetRoundDataWhenRoundDoesNotExistYet() (gas: 17897)
 OptimismSequencerUptimeFeed_AggregatorV3Interface:test_RevertGetTimestampWhenRoundDoesNotExistYet() (gas: 17603)
 OptimismSequencerUptimeFeed_Constructor:test_InitialState() (gas: 22110)
-OptimismSequencerUptimeFeed_GasCosts:test_GasCosts() (gas: 69567)
 OptimismSequencerUptimeFeed_ProtectReadsOnAggregatorV2V3InterfaceFunctions:test_AggregatorV2V3InterfaceAllowReadsIfConsumingContractIsWhitelisted() (gas: 601843)
 OptimismSequencerUptimeFeed_ProtectReadsOnAggregatorV2V3InterfaceFunctions:test_AggregatorV2V3InterfaceDisallowReadsIfConsumingContractIsNotWhitelisted() (gas: 574481)
-OptimismSequencerUptimeFeed_UpdateStatus:test_IgnoreOutOfOrderUpdates() (gas: 67230)
+OptimismSequencerUptimeFeed_UpdateStatus:test_IgnoreOutOfOrderUpdates() (gas: 69730)
 OptimismSequencerUptimeFeed_UpdateStatus:test_RevertIfNotL2CrossDomainMessengerAddr() (gas: 13214)
 OptimismSequencerUptimeFeed_UpdateStatus:test_RevertIfNotL2CrossDomainMessengerAddrAndNotL1SenderAddr() (gas: 23632)
-OptimismSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenNoChange() (gas: 77137)
-OptimismSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenStatusChangeAndNoTimeChange() (gas: 97545)
-OptimismSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenStatusChangeAndTimeChange() (gas: 97605)
+OptimismSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenNoChange() (gas: 79637)
+OptimismSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenStatusChangeAndNoTimeChange() (gas: 100045)
+OptimismSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenStatusChangeAndTimeChange() (gas: 100105)
 OptimismValidator_SetGasLimit:test_CorrectlyUpdatesTheGasLimit() (gas: 18695)
 OptimismValidator_Validate:test_PostSequencerOffline() (gas: 74813)
 OptimismValidator_Validate:test_PostSequencerStatusWhenThereIsNotStatusChange() (gas: 74869)
@@ -119,27 +103,19 @@ ScrollCrossDomainGovernor_TransferL1Ownership:test_CallableByL1Owner() (gas: 489
 ScrollCrossDomainGovernor_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 28841)
 ScrollCrossDomainGovernor_TransferL1Ownership:test_NotCallableByL2Owner() (gas: 16482)
 ScrollCrossDomainGovernor_TransferL1Ownership:test_NotCallableByNonOwners() (gas: 11030)
-ScrollSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForGetAnswer() (gas: 57940)
-ScrollSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForGetRoundData() (gas: 58476)
-ScrollSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForGetTimestamp() (gas: 57795)
-ScrollSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestAnswer() (gas: 55578)
-ScrollSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestRound() (gas: 55458)
-ScrollSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestRoundData() (gas: 56169)
-ScrollSequencerUptimeFeed_AggregatorInterfaceGasCosts:test_GasUsageForLatestTimestamp() (gas: 55448)
-ScrollSequencerUptimeFeed_AggregatorV3Interface:test_AggregatorV3Interface() (gas: 70090)
+ScrollSequencerUptimeFeed_AggregatorV3Interface:test_AggregatorV3Interface() (gas: 72590)
 ScrollSequencerUptimeFeed_AggregatorV3Interface:test_RevertGetAnswerWhenRoundDoesNotExistYet() (gas: 17675)
 ScrollSequencerUptimeFeed_AggregatorV3Interface:test_RevertGetRoundDataWhenRoundDoesNotExistYet() (gas: 17893)
 ScrollSequencerUptimeFeed_AggregatorV3Interface:test_RevertGetTimestampWhenRoundDoesNotExistYet() (gas: 17599)
 ScrollSequencerUptimeFeed_Constructor:test_InitialState() (gas: 103508)
-ScrollSequencerUptimeFeed_GasCosts:test_GasCosts() (gas: 67258)
 ScrollSequencerUptimeFeed_ProtectReadsOnAggregatorV2V3InterfaceFunctions:test_AggregatorV2V3InterfaceAllowReadsIfConsumingContractIsWhitelisted() (gas: 601694)
 ScrollSequencerUptimeFeed_ProtectReadsOnAggregatorV2V3InterfaceFunctions:test_AggregatorV2V3InterfaceDisallowReadsIfConsumingContractIsNotWhitelisted() (gas: 574481)
-ScrollSequencerUptimeFeed_UpdateStatus:test_IgnoreOutOfOrderUpdates() (gas: 65115)
+ScrollSequencerUptimeFeed_UpdateStatus:test_IgnoreOutOfOrderUpdates() (gas: 67615)
 ScrollSequencerUptimeFeed_UpdateStatus:test_RevertIfNotL2CrossDomainMessengerAddr() (gas: 13214)
 ScrollSequencerUptimeFeed_UpdateStatus:test_RevertIfNotL2CrossDomainMessengerAddrAndNotL1SenderAddr() (gas: 23632)
-ScrollSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenNoChange() (gas: 74720)
-ScrollSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenStatusChangeAndNoTimeChange() (gas: 93408)
-ScrollSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenStatusChangeAndTimeChange() (gas: 93468)
+ScrollSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenNoChange() (gas: 77220)
+ScrollSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenStatusChangeAndNoTimeChange() (gas: 95908)
+ScrollSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenStatusChangeAndTimeChange() (gas: 95968)
 ScrollValidator_SetGasLimit:test_CorrectlyUpdatesTheGasLimit() (gas: 18829)
 ScrollValidator_Validate:test_PostSequencerOffline() (gas: 78349)
 ScrollValidator_Validate:test_PostSequencerStatusWhenThereIsNotStatusChange() (gas: 78411)
diff --git a/contracts/gas-snapshots/liquiditymanager.gas-snapshot b/contracts/gas-snapshots/liquiditymanager.gas-snapshot
index ffd46c2e4e..6f67684cfc 100644
--- a/contracts/gas-snapshots/liquiditymanager.gas-snapshot
+++ b/contracts/gas-snapshots/liquiditymanager.gas-snapshot
@@ -39,7 +39,7 @@ OCR3Base_transmit:testForkedChainReverts() (gas: 42846)
 OCR3Base_transmit:testNonIncreasingSequenceNumberReverts() (gas: 30522)
 OCR3Base_transmit:testNonUniqueSignatureReverts() (gas: 60370)
 OCR3Base_transmit:testSignatureOutOfRegistrationReverts() (gas: 26128)
-OCR3Base_transmit:testTransmit2SignersSuccess_gas() (gas: 56783)
+OCR3Base_transmit:testTransmit2SignersSuccess_gas() (gas: 56771)
 OCR3Base_transmit:testUnAuthorizedTransmitterReverts() (gas: 28618)
 OCR3Base_transmit:testUnauthorizedSignerReverts() (gas: 44759)
 OCR3Base_transmit:testWrongNumberOfSignaturesReverts() (gas: 25678)
diff --git a/contracts/gas-snapshots/llo-feeds.gas-snapshot b/contracts/gas-snapshots/llo-feeds.gas-snapshot
index 0162809e90..187d3cd89f 100644
--- a/contracts/gas-snapshots/llo-feeds.gas-snapshot
+++ b/contracts/gas-snapshots/llo-feeds.gas-snapshot
@@ -72,7 +72,7 @@ FeeManagerProcessFeeTest:test_payLinkDeficitTwice() (gas: 198803)
 FeeManagerProcessFeeTest:test_processFeeAsProxy() (gas: 117088)
 FeeManagerProcessFeeTest:test_processFeeDefaultReportsStillVerifiesWithEmptyQuote() (gas: 27462)
 FeeManagerProcessFeeTest:test_processFeeEmitsEventIfNotEnoughLink() (gas: 163205)
-FeeManagerProcessFeeTest:test_processFeeIfSubscriberIsSelf() (gas: 27827)
+FeeManagerProcessFeeTest:test_processFeeIfSubscriberIsSelf() (gas: 30327)
 FeeManagerProcessFeeTest:test_processFeeNative() (gas: 173826)
 FeeManagerProcessFeeTest:test_processFeeUsesCorrectDigest() (gas: 118379)
 FeeManagerProcessFeeTest:test_processFeeWithDefaultReportPayloadAndQuoteStillVerifies() (gas: 29536)
diff --git a/contracts/gas-snapshots/operatorforwarder.gas-snapshot b/contracts/gas-snapshots/operatorforwarder.gas-snapshot
index 7cfc963f74..66bb19f1f6 100644
--- a/contracts/gas-snapshots/operatorforwarder.gas-snapshot
+++ b/contracts/gas-snapshots/operatorforwarder.gas-snapshot
@@ -2,8 +2,8 @@ FactoryTest:test_DeployNewForwarderAndTransferOwnership_Success() (gas: 1059722)
 FactoryTest:test_DeployNewForwarder_Success() (gas: 1048209)
 FactoryTest:test_DeployNewOperatorAndForwarder_Success() (gas: 4069305)
 FactoryTest:test_DeployNewOperator_Success() (gas: 3020464)
-ForwarderTest:test_Forward_Success(uint256) (runs: 256, μ: 226200, ~: 227289)
-ForwarderTest:test_MultiForward_Success(uint256,uint256) (runs: 256, μ: 257876, ~: 259120)
+ForwarderTest:test_Forward_Success(uint256) (runs: 257, μ: 226979, ~: 227289)
+ForwarderTest:test_MultiForward_Success(uint256,uint256) (runs: 257, μ: 258577, ~: 259120)
 ForwarderTest:test_OwnerForward_Success() (gas: 30118)
 ForwarderTest:test_SetAuthorizedSenders_Success() (gas: 160524)
 ForwarderTest:test_TransferOwnershipWithMessage_Success() (gas: 35123)
@@ -11,5 +11,5 @@ OperatorTest:test_CancelOracleRequest_Success() (gas: 274436)
 OperatorTest:test_FulfillOracleRequest_Success() (gas: 330603)
 OperatorTest:test_NotAuthorizedSender_Revert() (gas: 246716)
 OperatorTest:test_OracleRequest_Success() (gas: 250019)
-OperatorTest:test_SendRequestAndCancelRequest_Success(uint96) (runs: 256, μ: 387120, ~: 387124)
-OperatorTest:test_SendRequest_Success(uint96) (runs: 256, μ: 303611, ~: 303615)
\ No newline at end of file
+OperatorTest:test_SendRequestAndCancelRequest_Success(uint96) (runs: 257, μ: 387121, ~: 387124)
+OperatorTest:test_SendRequest_Success(uint96) (runs: 257, μ: 303612, ~: 303615)
\ No newline at end of file
diff --git a/contracts/gas-snapshots/shared.gas-snapshot b/contracts/gas-snapshots/shared.gas-snapshot
index c194511ca6..0848baa098 100644
--- a/contracts/gas-snapshots/shared.gas-snapshot
+++ b/contracts/gas-snapshots/shared.gas-snapshot
@@ -39,41 +39,41 @@ CallWithExactGas__callWithExactGas:test_CallWithExactGasSafeReturnDataExactGas()
 CallWithExactGas__callWithExactGas:test_NoContractReverts() (gas: 11559)
 CallWithExactGas__callWithExactGas:test_NoGasForCallExactCheckReverts() (gas: 15788)
 CallWithExactGas__callWithExactGas:test_NotEnoughGasForCallReverts() (gas: 16241)
-CallWithExactGas__callWithExactGas:test_callWithExactGasSuccess(bytes,bytes4) (runs: 256, μ: 15812, ~: 15752)
+CallWithExactGas__callWithExactGas:test_callWithExactGasSuccess(bytes,bytes4) (runs: 257, μ: 15767, ~: 15719)
 CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractExactGasSuccess() (gas: 20116)
 CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractReceiverErrorSuccess() (gas: 67721)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractSuccess(bytes,bytes4) (runs: 256, μ: 16321, ~: 16262)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractSuccess(bytes,bytes4) (runs: 257, μ: 16277, ~: 16229)
 CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NoContractSuccess() (gas: 12962)
 CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NoGasForCallExactCheckReturnFalseSuccess() (gas: 13005)
 CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NotEnoughGasForCallReturnsFalseSuccess() (gas: 13317)
 CallWithExactGas__callWithExactGasSafeReturnData:test_CallWithExactGasSafeReturnDataExactGas() (gas: 20331)
 CallWithExactGas__callWithExactGasSafeReturnData:test_NoContractReverts() (gas: 13917)
 CallWithExactGas__callWithExactGasSafeReturnData:test_NoGasForCallExactCheckReverts() (gas: 16139)
-CallWithExactGas__callWithExactGasSafeReturnData:test_NotEnoughGasForCallReverts() (gas: 16547)
-CallWithExactGas__callWithExactGasSafeReturnData:test_callWithExactGasSafeReturnData_ThrowOOGError_Revert() (gas: 36752)
+CallWithExactGas__callWithExactGasSafeReturnData:test_NotEnoughGasForCallReverts() (gas: 16569)
+CallWithExactGas__callWithExactGasSafeReturnData:test_callWithExactGasSafeReturnData_ThrowOOGError_Revert() (gas: 36708)
 EnumerableMapAddresses_at:testAtSuccess() (gas: 95086)
 EnumerableMapAddresses_at:testBytes32AtSuccess() (gas: 94877)
+EnumerableMapAddresses_at:testBytesAtSuccess() (gas: 96564)
 EnumerableMapAddresses_contains:testBytes32ContainsSuccess() (gas: 93518)
+EnumerableMapAddresses_contains:testBytesContainsSuccess() (gas: 94012)
 EnumerableMapAddresses_contains:testContainsSuccess() (gas: 93696)
 EnumerableMapAddresses_get:testBytes32GetSuccess() (gas: 94278)
+EnumerableMapAddresses_get:testBytesGetSuccess() (gas: 95879)
 EnumerableMapAddresses_get:testGetSuccess() (gas: 94453)
+EnumerableMapAddresses_get_errorMessage:testBytesGetErrorMessageSuccess() (gas: 95878)
 EnumerableMapAddresses_get_errorMessage:testGetErrorMessageSuccess() (gas: 94489)
 EnumerableMapAddresses_length:testBytes32LengthSuccess() (gas: 72445)
+EnumerableMapAddresses_length:testBytesLengthSuccess() (gas: 73011)
 EnumerableMapAddresses_length:testLengthSuccess() (gas: 72640)
 EnumerableMapAddresses_remove:testBytes32RemoveSuccess() (gas: 73462)
+EnumerableMapAddresses_remove:testBytesRemoveSuccess() (gas: 74249)
 EnumerableMapAddresses_remove:testRemoveSuccess() (gas: 73686)
 EnumerableMapAddresses_set:testBytes32SetSuccess() (gas: 94496)
+EnumerableMapAddresses_set:testBytesSetSuccess() (gas: 95428)
 EnumerableMapAddresses_set:testSetSuccess() (gas: 94685)
 EnumerableMapAddresses_tryGet:testBytes32TryGetSuccess() (gas: 94622)
-EnumerableMapAddresses_tryGet:testTryGetSuccess() (gas: 94893)
-EnumerableMapAddresses_at:testBytesAtSuccess() (gas: 96564)
-EnumerableMapAddresses_contains:testBytesContainsSuccess() (gas: 94012)
-EnumerableMapAddresses_get:testBytesGetSuccess() (gas: 95879)
-EnumerableMapAddresses_get_errorMessage:testBytesGetErrorMessageSuccess() (gas: 95878)
-EnumerableMapAddresses_length:testBytesLengthSuccess() (gas: 73011)
-EnumerableMapAddresses_remove:testBytesRemoveSuccess() (gas: 74249)
-EnumerableMapAddresses_set:testBytesSetSuccess() (gas: 95428)
 EnumerableMapAddresses_tryGet:testBytesTryGetSuccess() (gas: 96279)
+EnumerableMapAddresses_tryGet:testTryGetSuccess() (gas: 94893)
 OpStackBurnMintERC677_constructor:testConstructorSuccess() (gas: 1743649)
 OpStackBurnMintERC677_interfaceCompatibility:testBurnCompatibility() (gas: 298649)
 OpStackBurnMintERC677_interfaceCompatibility:testMintCompatibility() (gas: 137957)
diff --git a/contracts/package.json b/contracts/package.json
index 334b75701c..f8cc3a505e 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -79,26 +79,26 @@
     "@ethersproject/providers": "~5.7.2",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
     "@nomicfoundation/hardhat-ethers": "^3.0.6",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.9",
-    "@nomicfoundation/hardhat-verify": "^2.0.7",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.11",
+    "@nomicfoundation/hardhat-verify": "^2.0.9",
     "@typechain/ethers-v5": "^7.2.0",
     "@typechain/hardhat": "^7.0.0",
     "@types/cbor": "~5.0.1",
-    "@types/chai": "^4.3.16",
+    "@types/chai": "^4.3.17",
     "@types/debug": "^4.1.12",
     "@types/deep-equal-in-any-order": "^1.0.3",
-    "@types/mocha": "^10.0.6",
-    "@types/node": "^20.12.12",
-    "@typescript-eslint/eslint-plugin": "^7.10.0",
-    "@typescript-eslint/parser": "^7.10.0",
+    "@types/mocha": "^10.0.7",
+    "@types/node": "^20.14.15",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "abi-to-sol": "^0.6.6",
     "cbor": "^5.2.0",
-    "chai": "^4.3.10",
-    "debug": "^4.3.4",
+    "chai": "^4.5.0",
+    "debug": "^4.3.6",
     "deep-equal-in-any-order": "^2.0.6",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.2.1",
     "ethers": "~5.7.2",
     "hardhat": "~2.20.1",
     "hardhat-abi-exporter": "^2.10.1",
@@ -106,25 +106,25 @@
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
     "moment": "^2.30.1",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.3",
     "prettier-plugin-solidity": "^1.3.1",
-    "solhint": "^5.0.1",
+    "solhint": "^5.0.3",
     "solhint-plugin-chainlink-solidity": "git+https://github.com/smartcontractkit/chainlink-solhint-rules.git#v1.2.1",
     "solhint-plugin-prettier": "^0.1.0",
     "ts-node": "^10.9.2",
     "typechain": "^8.2.1",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   },
   "dependencies": {
     "@arbitrum/nitro-contracts": "1.1.1",
     "@arbitrum/token-bridge-contracts": "1.1.2",
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "~2.27.3",
+    "@changesets/cli": "~2.27.7",
     "@eth-optimism/contracts": "0.6.0",
     "@openzeppelin/contracts": "4.9.3",
     "@openzeppelin/contracts-upgradeable": "4.9.3",
     "@scroll-tech/contracts": "0.1.0",
-    "semver": "^7.6.2"
+    "semver": "^7.6.3"
   },
   "lint-staged": {
     "*.sol": [
diff --git a/contracts/pnpm-lock.yaml b/contracts/pnpm-lock.yaml
index 5c1dfecb44..e2a4f29137 100644
--- a/contracts/pnpm-lock.yaml
+++ b/contracts/pnpm-lock.yaml
@@ -21,8 +21,8 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0
       '@changesets/cli':
-        specifier: ~2.27.3
-        version: 2.27.3
+        specifier: ~2.27.7
+        version: 2.27.7
       '@eth-optimism/contracts':
         specifier: 0.6.0
         version: 0.6.0(ethers@5.7.2)
@@ -36,8 +36,8 @@ importers:
         specifier: 0.1.0
         version: 0.1.0
       semver:
-        specifier: ^7.6.2
-        version: 7.6.2
+        specifier: ^7.6.3
+        version: 7.6.3
     devDependencies:
       '@ethereum-waffle/mock-contract':
         specifier: ^3.4.4
@@ -56,28 +56,28 @@ importers:
         version: 5.7.2
       '@nomicfoundation/hardhat-chai-matchers':
         specifier: ^1.0.6
-        version: 1.0.6(@nomiclabs/hardhat-ethers@2.2.3(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)))(chai@4.4.1)(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))
+        version: 1.0.6(@nomiclabs/hardhat-ethers@2.2.3(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)))(chai@4.5.0)(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))
       '@nomicfoundation/hardhat-ethers':
         specifier: ^3.0.6
-        version: 3.0.6(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))
+        version: 3.0.6(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))
       '@nomicfoundation/hardhat-network-helpers':
-        specifier: ^1.0.9
-        version: 1.0.10(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))
+        specifier: ^1.0.11
+        version: 1.0.11(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))
       '@nomicfoundation/hardhat-verify':
-        specifier: ^2.0.7
-        version: 2.0.7(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))
+        specifier: ^2.0.9
+        version: 2.0.9(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))
       '@typechain/ethers-v5':
         specifier: ^7.2.0
-        version: 7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5)
+        version: 7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2(typescript@5.5.4))(typescript@5.5.4)
       '@typechain/hardhat':
         specifier: ^7.0.0
-        version: 7.0.0(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@typechain/ethers-v5@7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5))(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))(typechain@8.3.2(typescript@5.4.5))
+        version: 7.0.0(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@typechain/ethers-v5@7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2(typescript@5.5.4))(typescript@5.5.4))(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))(typechain@8.3.2(typescript@5.5.4))
       '@types/cbor':
         specifier: ~5.0.1
         version: 5.0.1
       '@types/chai':
-        specifier: ^4.3.16
-        version: 4.3.16
+        specifier: ^4.3.17
+        version: 4.3.17
       '@types/debug':
         specifier: ^4.1.12
         version: 4.1.12
@@ -85,17 +85,17 @@ importers:
         specifier: ^1.0.3
         version: 1.0.3
       '@types/mocha':
-        specifier: ^10.0.6
-        version: 10.0.6
+        specifier: ^10.0.7
+        version: 10.0.7
       '@types/node':
-        specifier: ^20.12.12
-        version: 20.12.12
+        specifier: ^20.14.15
+        version: 20.14.15
       '@typescript-eslint/eslint-plugin':
-        specifier: ^7.10.0
-        version: 7.10.0(@typescript-eslint/parser@7.10.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)
+        specifier: ^7.18.0
+        version: 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)
       '@typescript-eslint/parser':
-        specifier: ^7.10.0
-        version: 7.10.0(eslint@8.57.0)(typescript@5.4.5)
+        specifier: ^7.18.0
+        version: 7.18.0(eslint@8.57.0)(typescript@5.5.4)
       abi-to-sol:
         specifier: ^0.6.6
         version: 0.6.6
@@ -103,11 +103,11 @@ importers:
         specifier: ^5.2.0
         version: 5.2.0
       chai:
-        specifier: ^4.3.10
-        version: 4.4.1
+        specifier: ^4.5.0
+        version: 4.5.0
       debug:
-        specifier: ^4.3.4
-        version: 4.3.4(supports-color@8.1.1)
+        specifier: ^4.3.6
+        version: 4.3.6
       deep-equal-in-any-order:
         specifier: ^2.0.6
         version: 2.0.6
@@ -118,53 +118,53 @@ importers:
         specifier: ^9.1.0
         version: 9.1.0(eslint@8.57.0)
       eslint-plugin-prettier:
-        specifier: ^5.1.3
-        version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5)
+        specifier: ^5.2.1
+        version: 5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.3)
       ethers:
         specifier: ~5.7.2
         version: 5.7.2
       hardhat:
         specifier: ~2.20.1
-        version: 2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)
+        version: 2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)
       hardhat-abi-exporter:
         specifier: ^2.10.1
-        version: 2.10.1(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))
+        version: 2.10.1(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))
       hardhat-ignore-warnings:
         specifier: ^0.2.6
         version: 0.2.11
       husky:
         specifier: ^9.0.11
-        version: 9.0.11
+        version: 9.1.5
       lint-staged:
         specifier: ^15.2.2
-        version: 15.2.2
+        version: 15.2.9
       moment:
         specifier: ^2.30.1
         version: 2.30.1
       prettier:
-        specifier: ^3.2.5
-        version: 3.2.5
+        specifier: ^3.3.3
+        version: 3.3.3
       prettier-plugin-solidity:
         specifier: ^1.3.1
-        version: 1.3.1(prettier@3.2.5)
+        version: 1.3.1(prettier@3.3.3)
       solhint:
-        specifier: ^5.0.1
-        version: 5.0.1
+        specifier: ^5.0.3
+        version: 5.0.3
       solhint-plugin-chainlink-solidity:
         specifier: git+https://github.com/smartcontractkit/chainlink-solhint-rules.git#v1.2.1
         version: '@chainlink/solhint-plugin-chainlink-solidity@https://codeload.github.com/smartcontractkit/chainlink-solhint-rules/tar.gz/1b4c0c2663fcd983589d4f33a2e73908624ed43c'
       solhint-plugin-prettier:
         specifier: ^0.1.0
-        version: 0.1.0(prettier-plugin-solidity@1.3.1(prettier@3.2.5))(prettier@3.2.5)
+        version: 0.1.0(prettier-plugin-solidity@1.3.1(prettier@3.3.3))(prettier@3.3.3)
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@types/node@20.12.12)(typescript@5.4.5)
+        version: 10.9.2(@types/node@20.14.15)(typescript@5.5.4)
       typechain:
         specifier: ^8.2.1
-        version: 8.3.2(typescript@5.4.5)
+        version: 8.3.2(typescript@5.5.4)
       typescript:
-        specifier: ^5.4.5
-        version: 5.4.5
+        specifier: ^5.5.4
+        version: 5.5.4
 
 packages:
 
@@ -198,11 +198,11 @@ packages:
     resolution: {tarball: https://codeload.github.com/smartcontractkit/chainlink-solhint-rules/tar.gz/1b4c0c2663fcd983589d4f33a2e73908624ed43c}
     version: 1.2.0
 
-  '@changesets/apply-release-plan@7.0.1':
-    resolution: {integrity: sha512-aPdSq/R++HOyfEeBGjEe6LNG8gs0KMSyRETD/J2092OkNq8mOioAxyKjMbvVUdzgr/HTawzMOz7lfw339KnsCA==}
+  '@changesets/apply-release-plan@7.0.4':
+    resolution: {integrity: sha512-HLFwhKWayKinWAul0Vj+76jVx1Pc2v55MGPVjZ924Y/ROeSsBMFutv9heHmCUj48lJyRfOTJG5+ar+29FUky/A==}
 
-  '@changesets/assemble-release-plan@6.0.0':
-    resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==}
+  '@changesets/assemble-release-plan@6.0.3':
+    resolution: {integrity: sha512-bLNh9/Lgl1VwkjWZTq8JmRqH+hj7/Yzfz0jsQ/zJJ+FTmVqmqPj3szeKOri8O/hEM8JmHW019vh2gTO9iq5Cuw==}
 
   '@changesets/changelog-git@0.2.0':
     resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==}
@@ -210,24 +210,24 @@ packages:
   '@changesets/changelog-github@0.5.0':
     resolution: {integrity: sha512-zoeq2LJJVcPJcIotHRJEEA2qCqX0AQIeFE+L21L8sRLPVqDhSXY8ZWAt2sohtBpFZkBwu+LUwMSKRr2lMy3LJA==}
 
-  '@changesets/cli@2.27.3':
-    resolution: {integrity: sha512-ve/VpWApILlSs8cr0okNx5C2LKRawI9XZgvfmf58S8sar2nhx5DPJREFXYZBahs0FeTfvH0rdVl+nGe8QF45Ig==}
+  '@changesets/cli@2.27.7':
+    resolution: {integrity: sha512-6lr8JltiiXPIjDeYg4iM2MeePP6VN/JkmqBsVA5XRiy01hGS3y629LtSDvKcycj/w/5Eur1rEwby/MjcYS+e2A==}
     hasBin: true
 
-  '@changesets/config@3.0.0':
-    resolution: {integrity: sha512-o/rwLNnAo/+j9Yvw9mkBQOZySDYyOr/q+wptRLcAVGlU6djOeP9v1nlalbL9MFsobuBVQbZCTp+dIzdq+CLQUA==}
+  '@changesets/config@3.0.2':
+    resolution: {integrity: sha512-cdEhS4t8woKCX2M8AotcV2BOWnBp09sqICxKapgLHf9m5KdENpWjyrFNMjkLqGJtUys9U+w93OxWT0czorVDfw==}
 
   '@changesets/errors@0.2.0':
     resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==}
 
-  '@changesets/get-dependents-graph@2.0.0':
-    resolution: {integrity: sha512-cafUXponivK4vBgZ3yLu944mTvam06XEn2IZGjjKc0antpenkYANXiiE6GExV/yKdsCnE8dXVZ25yGqLYZmScA==}
+  '@changesets/get-dependents-graph@2.1.1':
+    resolution: {integrity: sha512-LRFjjvigBSzfnPU2n/AhFsuWR5DK++1x47aq6qZ8dzYsPtS/I5mNhIGAS68IAxh1xjO9BTtz55FwefhANZ+FCA==}
 
   '@changesets/get-github-info@0.6.0':
     resolution: {integrity: sha512-v/TSnFVXI8vzX9/w3DU2Ol+UlTZcu3m0kXTjTT4KlAdwSvwutcByYwyYn9hwerPWfPkT2JfpoX0KgvCEi8Q/SA==}
 
-  '@changesets/get-release-plan@4.0.0':
-    resolution: {integrity: sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==}
+  '@changesets/get-release-plan@4.0.3':
+    resolution: {integrity: sha512-6PLgvOIwTSdJPTtpdcr3sLtGatT+Jr22+cQwEBJBy6wP0rjB4yJ9lv583J9fVpn1bfQlBkDa8JxbS2g/n9lIyA==}
 
   '@changesets/get-version-range-type@0.4.0':
     resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==}
@@ -247,6 +247,9 @@ packages:
   '@changesets/read@0.6.0':
     resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==}
 
+  '@changesets/should-skip-package@0.1.0':
+    resolution: {integrity: sha512-FxG6Mhjw7yFStlSM7Z0Gmg3RiyQ98d/9VpQAZ3Fzr59dCOM9G6ZdYbjiSAt0XtFr9JR5U2tBaJWPjrkGGc618g==}
+
   '@changesets/types@4.1.0':
     resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==}
 
@@ -509,15 +512,15 @@ packages:
       ethers: ^6.1.0
       hardhat: ^2.0.0
 
-  '@nomicfoundation/hardhat-network-helpers@1.0.10':
-    resolution: {integrity: sha512-R35/BMBlx7tWN5V6d/8/19QCwEmIdbnA4ZrsuXgvs8i2qFx5i7h6mH5pBS4Pwi4WigLH+upl6faYusrNPuzMrQ==}
+  '@nomicfoundation/hardhat-network-helpers@1.0.11':
+    resolution: {integrity: sha512-uGPL7QSKvxrHRU69dx8jzoBvuztlLCtyFsbgfXIwIjnO3dqZRz2GNMHJoO3C3dIiUNM6jdNF4AUnoQKDscdYrA==}
     peerDependencies:
       hardhat: ^2.9.5
 
-  '@nomicfoundation/hardhat-verify@2.0.7':
-    resolution: {integrity: sha512-jiYHBX+K6bBN0YhwFHQ5SWWc3dQZliM3pdgpH33C7tnsVACsX1ubZn6gZ9hfwlzG0tyjFM72XQhpaXQ56cE6Ew==}
+  '@nomicfoundation/hardhat-verify@2.0.9':
+    resolution: {integrity: sha512-7kD8hu1+zlnX87gC+UN4S0HTKBnIsDfXZ/pproq1gYsK94hgCk+exvzXbwR0X2giiY/RZPkqY9oKRi0Uev91hQ==}
     peerDependencies:
-      hardhat: ^2.0.4
+      hardhat: ^2.22.72.0.4
 
   '@nomicfoundation/solidity-analyzer-darwin-arm64@0.1.0':
     resolution: {integrity: sha512-vEF3yKuuzfMHsZecHQcnkUrqm8mnTWfJeEVFHpg+cO+le96xQA4lAJYdUan8pXZohQxv1fSReQsn4QGNuBNuCw==}
@@ -616,8 +619,8 @@ packages:
   '@openzeppelin/contracts@4.9.3':
     resolution: {integrity: sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg==}
 
-  '@openzeppelin/upgrades-core@1.32.5':
-    resolution: {integrity: sha512-R0wprsyJ4xWiRW05kaTfZZkRVpG2g0af3/hpjE7t2mX0Eb2n40MQLokTwqIk4LDzpp910JfLSpB0vBuZ6WNPog==}
+  '@openzeppelin/upgrades-core@1.34.4':
+    resolution: {integrity: sha512-iGN3StqYHYVqqSKs8hWY+Gz6VkiEqOkQccBhHl7lHLGBJF91QUZ8wNMZ59SA5Usg1Fstu/HurvZTCEshPJAZ8w==}
     hasBin: true
 
   '@pkgr/core@0.1.1':
@@ -748,8 +751,8 @@ packages:
   '@types/chai-as-promised@7.1.8':
     resolution: {integrity: sha512-ThlRVIJhr69FLlh6IctTXFkmhtP3NpMZ2QGq69StYLyKZFp/HOp1VdKZj7RvfNWYYcJ1xlbLGLLWj1UvP5u/Gw==}
 
-  '@types/chai@4.3.16':
-    resolution: {integrity: sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==}
+  '@types/chai@4.3.17':
+    resolution: {integrity: sha512-zmZ21EWzR71B4Sscphjief5djsLre50M6lI622OSySTmn9DB3j+C3kWroHfBQWXbOBwbgg/M8CG/hUxDLIloow==}
 
   '@types/debug@4.1.12':
     resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
@@ -766,11 +769,8 @@ packages:
   '@types/lru-cache@5.1.1':
     resolution: {integrity: sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==}
 
-  '@types/minimist@1.2.5':
-    resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==}
-
-  '@types/mocha@10.0.6':
-    resolution: {integrity: sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==}
+  '@types/mocha@10.0.7':
+    resolution: {integrity: sha512-GN8yJ1mNTcFcah/wKEFIJckJx9iJLoMSzWcfRRuxz/Jk+U6KQNnml+etbtxFK8lPjzOw3zp4Ha/kjSst9fsHYw==}
 
   '@types/ms@0.7.31':
     resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
@@ -778,11 +778,8 @@ packages:
   '@types/node@12.19.16':
     resolution: {integrity: sha512-7xHmXm/QJ7cbK2laF+YYD7gb5MggHIIQwqyjin3bpEGiSuvScMQ5JZZXPvRipi1MwckTQbJZROMns/JxdnIL1Q==}
 
-  '@types/node@20.12.12':
-    resolution: {integrity: sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==}
-
-  '@types/normalize-package-data@2.4.4':
-    resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
+  '@types/node@20.14.15':
+    resolution: {integrity: sha512-Fz1xDMCF/B00/tYSVMlmK7hVeLh7jE5f3B7X1/hmV0MJBwE27KlS7EvD/Yp+z1lm8mVhwV5w+n8jOZG8AfTlKw==}
 
   '@types/pbkdf2@3.1.0':
     resolution: {integrity: sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==}
@@ -802,8 +799,8 @@ packages:
   '@types/semver@7.5.0':
     resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==}
 
-  '@typescript-eslint/eslint-plugin@7.10.0':
-    resolution: {integrity: sha512-PzCr+a/KAef5ZawX7nbyNwBDtM1HdLIT53aSA2DDlxmxMngZ43O8SIePOeX8H5S+FHXeI6t97mTt/dDdzY4Fyw==}
+  '@typescript-eslint/eslint-plugin@7.18.0':
+    resolution: {integrity: sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^7.0.0
@@ -813,8 +810,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/parser@7.10.0':
-    resolution: {integrity: sha512-2EjZMA0LUW5V5tGQiaa2Gys+nKdfrn2xiTIBLR4fxmPmVSvgPcKNW+AE/ln9k0A4zDUti0J/GZXMDupQoI+e1w==}
+  '@typescript-eslint/parser@7.18.0':
+    resolution: {integrity: sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
@@ -823,12 +820,12 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/scope-manager@7.10.0':
-    resolution: {integrity: sha512-7L01/K8W/VGl7noe2mgH0K7BE29Sq6KAbVmxurj8GGaPDZXPr8EEQ2seOeAS+mEV9DnzxBQB6ax6qQQ5C6P4xg==}
+  '@typescript-eslint/scope-manager@7.18.0':
+    resolution: {integrity: sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
-  '@typescript-eslint/type-utils@7.10.0':
-    resolution: {integrity: sha512-D7tS4WDkJWrVkuzgm90qYw9RdgBcrWmbbRkrLA4d7Pg3w0ttVGDsvYGV19SH8gPR5L7OtcN5J1hTtyenO9xE9g==}
+  '@typescript-eslint/type-utils@7.18.0':
+    resolution: {integrity: sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
@@ -837,12 +834,12 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/types@7.10.0':
-    resolution: {integrity: sha512-7fNj+Ya35aNyhuqrA1E/VayQX9Elwr8NKZ4WueClR3KwJ7Xx9jcCdOrLW04h51de/+gNbyFMs+IDxh5xIwfbNg==}
+  '@typescript-eslint/types@7.18.0':
+    resolution: {integrity: sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
-  '@typescript-eslint/typescript-estree@7.10.0':
-    resolution: {integrity: sha512-LXFnQJjL9XIcxeVfqmNj60YhatpRLt6UhdlFwAkjNc6jSUlK8zQOl1oktAP8PlWFzPQC1jny/8Bai3/HPuvN5g==}
+  '@typescript-eslint/typescript-estree@7.18.0':
+    resolution: {integrity: sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       typescript: '*'
@@ -850,14 +847,14 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/utils@7.10.0':
-    resolution: {integrity: sha512-olzif1Fuo8R8m/qKkzJqT7qwy16CzPRWBvERS0uvyc+DHd8AKbO4Jb7kpAvVzMmZm8TrHnI7hvjN4I05zow+tg==}
+  '@typescript-eslint/utils@7.18.0':
+    resolution: {integrity: sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
 
-  '@typescript-eslint/visitor-keys@7.10.0':
-    resolution: {integrity: sha512-9ntIVgsi6gg6FIq9xjEO4VQJvwOqA3jaBFQJ/6TK5AvEup2+cECI6Fh7QiBxmfMHXU0V0J4RyPeOU1VDNzl9cg==}
+  '@typescript-eslint/visitor-keys@7.18.0':
+    resolution: {integrity: sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
   '@ungap/structured-clone@1.2.0':
@@ -925,9 +922,9 @@ packages:
     resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
     engines: {node: '>=8'}
 
-  ansi-escapes@6.2.1:
-    resolution: {integrity: sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==}
-    engines: {node: '>=14.16'}
+  ansi-escapes@7.0.0:
+    resolution: {integrity: sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==}
+    engines: {node: '>=18'}
 
   ansi-regex@2.1.1:
     resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
@@ -993,10 +990,6 @@ packages:
     resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
     engines: {node: '>= 0.4'}
 
-  array.prototype.flat@1.3.2:
-    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
-    engines: {node: '>= 0.4'}
-
   arraybuffer.prototype.slice@1.0.2:
     resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==}
     engines: {node: '>= 0.4'}
@@ -1005,10 +998,6 @@ packages:
     resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
     engines: {node: '>= 0.4'}
 
-  arrify@1.0.1:
-    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
-    engines: {node: '>=0.10.0'}
-
   assertion-error@1.1.0:
     resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
 
@@ -1086,8 +1075,9 @@ packages:
     resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
     engines: {node: '>=8'}
 
-  breakword@1.0.6:
-    resolution: {integrity: sha512-yjxDAYyK/pBvws9H4xKYpLDpYKEH6CzrBPAuXq3x18I+c/2MkVtT3qAr7Oloi6Dss9qNhPVueAAVU1CSeNDIXw==}
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
 
   brorand@1.1.0:
     resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==}
@@ -1140,14 +1130,6 @@ packages:
   camel-case@3.0.0:
     resolution: {integrity: sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==}
 
-  camelcase-keys@6.2.2:
-    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
-    engines: {node: '>=8'}
-
-  camelcase@5.3.1:
-    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
-    engines: {node: '>=6'}
-
   camelcase@6.3.0:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
     engines: {node: '>=10'}
@@ -1169,8 +1151,8 @@ packages:
     peerDependencies:
       chai: '>= 2.1.2 < 5'
 
-  chai@4.4.1:
-    resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==}
+  chai@4.5.0:
+    resolution: {integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==}
     engines: {node: '>=4'}
 
   chalk@2.4.2:
@@ -1216,31 +1198,20 @@ packages:
     resolution: {integrity: sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==}
     engines: {node: '>=6'}
 
-  cli-cursor@4.0.0:
-    resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  cli-cursor@5.0.0:
+    resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
+    engines: {node: '>=18'}
 
   cli-truncate@4.0.0:
     resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}
     engines: {node: '>=18'}
 
-  cliui@6.0.0:
-    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
-
   cliui@7.0.4:
     resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
 
-  cliui@8.0.1:
-    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
-    engines: {node: '>=12'}
-
   clone-response@1.0.2:
     resolution: {integrity: sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==}
 
-  clone@1.0.4:
-    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
-    engines: {node: '>=0.8'}
-
   code-error-fragment@0.0.230:
     resolution: {integrity: sha512-cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw==}
     engines: {node: '>= 4'}
@@ -1276,15 +1247,15 @@ packages:
     resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
     engines: {node: '>=14'}
 
-  commander@11.1.0:
-    resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
-    engines: {node: '>=16'}
+  commander@12.1.0:
+    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
+    engines: {node: '>=18'}
 
   commander@3.0.2:
     resolution: {integrity: sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==}
 
-  compare-versions@6.1.0:
-    resolution: {integrity: sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg==}
+  compare-versions@6.1.1:
+    resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}
 
   concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
@@ -1326,19 +1297,6 @@ packages:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
 
-  csv-generate@3.4.3:
-    resolution: {integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==}
-
-  csv-parse@4.16.3:
-    resolution: {integrity: sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==}
-
-  csv-stringify@5.6.5:
-    resolution: {integrity: sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==}
-
-  csv@5.5.3:
-    resolution: {integrity: sha512-QTaY0XjjhTQOdguARF0lGKm5/mEq9PD9/VhZZegHDIBq2tQwgNpHc3dneD4mGo2iJs+fTKv5Bp0fZ+BRuY3Z0g==}
-    engines: {node: '>= 0.1.90'}
-
   data-view-buffer@1.0.1:
     resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
     engines: {node: '>= 0.4'}
@@ -1363,13 +1321,14 @@ packages:
       supports-color:
         optional: true
 
-  decamelize-keys@1.1.1:
-    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
-    engines: {node: '>=0.10.0'}
-
-  decamelize@1.2.0:
-    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
-    engines: {node: '>=0.10.0'}
+  debug@4.3.6:
+    resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
 
   decamelize@4.0.0:
     resolution: {integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==}
@@ -1393,9 +1352,6 @@ packages:
   deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
-  defaults@1.0.4:
-    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
-
   defer-to-connect@2.0.1:
     resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==}
     engines: {node: '>=10'}
@@ -1451,8 +1407,8 @@ packages:
   elliptic@6.5.4:
     resolution: {integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==}
 
-  emoji-regex@10.3.0:
-    resolution: {integrity: sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==}
+  emoji-regex@10.4.0:
+    resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==}
 
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -1468,6 +1424,10 @@ packages:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
     engines: {node: '>=6'}
 
+  environment@1.1.0:
+    resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}
+    engines: {node: '>=18'}
+
   error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
 
@@ -1524,8 +1484,8 @@ packages:
     peerDependencies:
       eslint: '>=7.0.0'
 
-  eslint-plugin-prettier@5.1.3:
-    resolution: {integrity: sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==}
+  eslint-plugin-prettier@5.2.1:
+    resolution: {integrity: sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       '@types/eslint': '>=8.0.0'
@@ -1654,6 +1614,10 @@ packages:
     resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
     engines: {node: '>=8'}
 
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
   find-replace@3.0.0:
     resolution: {integrity: sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==}
     engines: {node: '>=4.0.0'}
@@ -1796,6 +1760,7 @@ packages:
   glob@8.1.0:
     resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
     engines: {node: '>=12'}
+    deprecated: Glob versions prior to v9 are no longer supported
 
   globals@13.24.0:
     resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
@@ -1825,10 +1790,6 @@ packages:
   graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
-  hard-rejection@2.1.0:
-    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
-    engines: {node: '>=6'}
-
   hardhat-abi-exporter@2.10.1:
     resolution: {integrity: sha512-X8GRxUTtebMAd2k4fcPyVnCdPa6dYK4lBsrwzKP5yiSq4i+WadWPIumaLfce53TUf/o2TnLpLOduyO1ylE2NHQ==}
     engines: {node: '>=14.14.0'}
@@ -1887,10 +1848,6 @@ packages:
     resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
     engines: {node: '>= 0.4'}
 
-  has@1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
-    engines: {node: '>= 0.4.0'}
-
   hash-base@3.1.0:
     resolution: {integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==}
     engines: {node: '>=4'}
@@ -1916,9 +1873,6 @@ packages:
   hmac-drbg@1.0.1:
     resolution: {integrity: sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==}
 
-  hosted-git-info@2.8.9:
-    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
-
   http-cache-semantics@4.0.3:
     resolution: {integrity: sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==}
 
@@ -1941,8 +1895,8 @@ packages:
     resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
     engines: {node: '>=16.17.0'}
 
-  husky@9.0.11:
-    resolution: {integrity: sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==}
+  husky@9.1.5:
+    resolution: {integrity: sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -2022,9 +1976,6 @@ packages:
     resolution: {integrity: sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==}
     hasBin: true
 
-  is-core-module@2.10.0:
-    resolution: {integrity: sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==}
-
   is-data-view@1.0.1:
     resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
     engines: {node: '>= 0.4'}
@@ -2085,10 +2036,6 @@ packages:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
 
-  is-plain-obj@1.1.0:
-    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
-    engines: {node: '>=0.10.0'}
-
   is-plain-obj@2.1.0:
     resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
     engines: {node: '>=8'}
@@ -2205,26 +2152,15 @@ packages:
     resolution: {integrity: sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ==}
     engines: {node: '>=10.0.0'}
 
-  keyv@4.5.0:
-    resolution: {integrity: sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA==}
-
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
-  kind-of@6.0.3:
-    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
-    engines: {node: '>=0.10.0'}
-
   klaw-sync@6.0.0:
     resolution: {integrity: sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==}
 
   klaw@1.3.1:
     resolution: {integrity: sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==}
 
-  kleur@4.1.5:
-    resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
-    engines: {node: '>=6'}
-
   latest-version@7.0.0:
     resolution: {integrity: sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==}
     engines: {node: '>=14.16'}
@@ -2237,20 +2173,20 @@ packages:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
 
-  lilconfig@3.0.0:
-    resolution: {integrity: sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==}
+  lilconfig@3.1.2:
+    resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==}
     engines: {node: '>=14'}
 
   lines-and-columns@1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
-  lint-staged@15.2.2:
-    resolution: {integrity: sha512-TiTt93OPh1OZOsb5B7k96A/ATl2AjIZo+vnzFZ6oHK5FuTk63ByDtxGQpHm+kFETjEWqgkF95M8FRXKR/LEBcw==}
+  lint-staged@15.2.9:
+    resolution: {integrity: sha512-BZAt8Lk3sEnxw7tfxM7jeZlPRuT4M68O0/CwZhhaw6eeWu0Lz5eERE3m386InivXB64fp/mDID452h48tvKlRQ==}
     engines: {node: '>=18.12.0'}
     hasBin: true
 
-  listr2@8.0.1:
-    resolution: {integrity: sha512-ovJXBXkKGfq+CwmKTjluEqFi3p4h8xvkxGQQAQan22YCgef4KZ1mKGjzfGh6PL6AW5Csw0QiQPNuQyH+6Xk3hA==}
+  listr2@8.2.4:
+    resolution: {integrity: sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==}
     engines: {node: '>=18.0.0'}
 
   load-yaml-file@0.2.0:
@@ -2297,8 +2233,8 @@ packages:
     resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
     engines: {node: '>=10'}
 
-  log-update@6.0.0:
-    resolution: {integrity: sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==}
+  log-update@6.1.0:
+    resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==}
     engines: {node: '>=18'}
 
   loupe@2.3.7:
@@ -2331,14 +2267,6 @@ packages:
   make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
 
-  map-obj@1.0.1:
-    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
-    engines: {node: '>=0.10.0'}
-
-  map-obj@4.3.0:
-    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
-    engines: {node: '>=8'}
-
   md5.js@1.3.5:
     resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==}
 
@@ -2346,10 +2274,6 @@ packages:
     resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
     engines: {node: '>= 0.10.0'}
 
-  meow@6.1.1:
-    resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==}
-    engines: {node: '>=8'}
-
   merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
@@ -2361,14 +2285,18 @@ packages:
     resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
     engines: {node: '>=8.6'}
 
-  mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
 
   mimic-fn@4.0.0:
     resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
     engines: {node: '>=12'}
 
+  mimic-function@5.0.1:
+    resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
+    engines: {node: '>=18'}
+
   mimic-response@1.0.1:
     resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
     engines: {node: '>=4'}
@@ -2377,10 +2305,6 @@ packages:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
     engines: {node: '>=10'}
 
-  min-indent@1.0.1:
-    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
-    engines: {node: '>=4'}
-
   minimalistic-assert@1.0.1:
     resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
 
@@ -2402,17 +2326,9 @@ packages:
     resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==}
     engines: {node: '>=16 || 14 >=14.17'}
 
-  minimist-options@4.1.0:
-    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
-    engines: {node: '>= 6'}
-
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
-  mixme@0.5.10:
-    resolution: {integrity: sha512-5H76ANWinB1H3twpJ6JY8uvAtpmFvHNArpilJAjXRKXSDDLPIMoZArw5SH0q9z+lLs8IrMw7Q2VWpWimFKFT1Q==}
-    engines: {node: '>= 8.0.0'}
-
   mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
     engines: {node: '>=10'}
@@ -2429,6 +2345,10 @@ packages:
   moment@2.30.1:
     resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
 
+  mri@1.2.0:
+    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
+    engines: {node: '>=4'}
+
   ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
 
@@ -2480,9 +2400,6 @@ packages:
     resolution: {integrity: sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==}
     engines: {node: '>=12.19'}
 
-  normalize-package-data@2.5.0:
-    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
-
   normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
@@ -2520,14 +2437,14 @@ packages:
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
-  onetime@5.1.2:
-    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: '>=6'}
-
   onetime@6.0.0:
     resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
     engines: {node: '>=12'}
 
+  onetime@7.0.0:
+    resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
+    engines: {node: '>=18'}
+
   open@7.4.2:
     resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
     engines: {node: '>=8'}
@@ -2710,8 +2627,8 @@ packages:
     engines: {node: '>=10.13.0'}
     hasBin: true
 
-  prettier@3.2.5:
-    resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
+  prettier@3.3.3:
+    resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -2734,10 +2651,6 @@ packages:
   pure-rand@5.0.3:
     resolution: {integrity: sha512-9N8x1h8dptBQpHyC7aZMS+iNOAm97WMGY0AFrguU1cpfW3I5jINkWe5BIY5md0ofy+1TCIELsVcm/GJXZSaPbw==}
 
-  quick-lru@4.0.1:
-    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
-    engines: {node: '>=8'}
-
   quick-lru@5.1.1:
     resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
     engines: {node: '>=10'}
@@ -2753,14 +2666,6 @@ packages:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
 
-  read-pkg-up@7.0.1:
-    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
-    engines: {node: '>=8'}
-
-  read-pkg@5.2.0:
-    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
-    engines: {node: '>=8'}
-
   read-yaml-file@1.1.0:
     resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==}
     engines: {node: '>=6'}
@@ -2773,10 +2678,6 @@ packages:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
 
-  redent@3.0.0:
-    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
-    engines: {node: '>=8'}
-
   reduce-flatten@2.0.0:
     resolution: {integrity: sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==}
     engines: {node: '>=6'}
@@ -2808,9 +2709,6 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
-  require-main-filename@2.0.0:
-    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
-
   resolve-alpn@1.2.1:
     resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
 
@@ -2825,16 +2723,12 @@ packages:
   resolve@1.17.0:
     resolution: {integrity: sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==}
 
-  resolve@1.22.1:
-    resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
-    hasBin: true
-
   responselike@2.0.1:
     resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
 
-  restore-cursor@4.0.0:
-    resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  restore-cursor@5.1.0:
+    resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
+    engines: {node: '>=18'}
 
   retry@0.12.0:
     resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
@@ -2844,8 +2738,8 @@ packages:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  rfdc@1.3.1:
-    resolution: {integrity: sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==}
+  rfdc@1.4.1:
+    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
 
   rimraf@2.7.1:
     resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
@@ -2910,8 +2804,8 @@ packages:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
 
-  semver@7.6.2:
-    resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==}
+  semver@7.6.3:
+    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -2921,9 +2815,6 @@ packages:
   serialize-javascript@6.0.0:
     resolution: {integrity: sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==}
 
-  set-blocking@2.0.0:
-    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
-
   set-function-length@1.1.1:
     resolution: {integrity: sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==}
     engines: {node: '>= 0.4'}
@@ -2995,11 +2886,6 @@ packages:
     resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==}
     engines: {node: '>=18'}
 
-  smartwrap@2.0.2:
-    resolution: {integrity: sha512-vCsKNQxb7PnCNd2wY1WClWifAc2lwqsG8OaswpJkVJsvMGcnEntdTCDajZCkk93Ay1U3t/9puJmb525Rg5MZBA==}
-    engines: {node: '>=6'}
-    hasBin: true
-
   snake-case@2.1.0:
     resolution: {integrity: sha512-FMR5YoPFwOLuh4rRz92dywJjyKYZNLpMn1R5ujVpIYkbA9p01fq8RMg0FkO4M+Yobt4MjHeLTJVm5xFFBHSV2Q==}
 
@@ -3014,8 +2900,8 @@ packages:
       prettier: ^3.0.0
       prettier-plugin-solidity: ^1.0.0
 
-  solhint@5.0.1:
-    resolution: {integrity: sha512-QeQLS9HGCnIiibt+xiOa/+MuP7BWz9N7C5+Mj9pLHshdkNhuo3AzCpWmjfWVZBUuwIUO3YyCRVIcYLR3YOKGfg==}
+  solhint@5.0.3:
+    resolution: {integrity: sha512-OLCH6qm/mZTCpplTXzXTJGId1zrtNuDYP5c2e6snIv/hdRVxPfBBz/bAlL91bY/Accavkayp2Zp2BaDSrLVXTQ==}
     hasBin: true
 
   solidity-ast@0.4.56:
@@ -3101,18 +2987,6 @@ packages:
   spawndamnit@2.0.0:
     resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==}
 
-  spdx-correct@3.1.1:
-    resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==}
-
-  spdx-exceptions@2.3.0:
-    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
-
-  spdx-expression-parse@3.0.1:
-    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
-
-  spdx-license-ids@3.0.12:
-    resolution: {integrity: sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==}
-
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
@@ -3124,9 +2998,6 @@ packages:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
 
-  stream-transform@2.1.3:
-    resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==}
-
   string-argv@0.3.2:
     resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
     engines: {node: '>=0.6.19'}
@@ -3138,8 +3009,8 @@ packages:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
 
-  string-width@7.1.0:
-    resolution: {integrity: sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==}
+  string-width@7.2.0:
+    resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
     engines: {node: '>=18'}
 
   string.prototype.trim@1.2.8:
@@ -3186,10 +3057,6 @@ packages:
     resolution: {integrity: sha1-DF8VX+8RUTczd96du1iNoFUA428=}
     engines: {node: '>=6.5.0', npm: '>=3'}
 
-  strip-indent@3.0.0:
-    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
-    engines: {node: '>=8'}
-
   strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
     engines: {node: '>=0.10.0'}
@@ -3210,15 +3077,11 @@ packages:
     resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
     engines: {node: '>=10'}
 
-  supports-preserve-symlinks-flag@1.0.0:
-    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
-    engines: {node: '>= 0.4'}
-
   swap-case@1.1.2:
     resolution: {integrity: sha512-BAmWG6/bx8syfc6qXPprof3Mn5vQgf5dwdUNJhsNqU9WdPt5P+ES/wQ5bxfijy8zwZgZZHslC3iAsxsuQMCzJQ==}
 
-  synckit@0.8.8:
-    resolution: {integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==}
+  synckit@0.9.1:
+    resolution: {integrity: sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==}
     engines: {node: ^14.18.0 || >=16.0.0}
 
   table-layout@1.0.2:
@@ -3254,10 +3117,6 @@ packages:
   tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
-  trim-newlines@3.0.1:
-    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
-    engines: {node: '>=8'}
-
   ts-api-utils@1.3.0:
     resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
     engines: {node: '>=16'}
@@ -3296,11 +3155,6 @@ packages:
   tsort@0.0.1:
     resolution: {integrity: sha512-Tyrf5mxF8Ofs1tNoxA13lFeZ2Zrbd6cKbuH3V+MQ5sb6DtBj5FjrXVsRWT8YvNAQTqNoz66dz1WsbigI22aEnw==}
 
-  tty-table@4.2.3:
-    resolution: {integrity: sha512-Fs15mu0vGzCrj8fmJNP7Ynxt5J7praPXqFN0leZeZBXJwkMxv9cb2D454k1ltrtUSJbZ4yH4e0CynsHLxmUfFA==}
-    engines: {node: '>=8.0.0'}
-    hasBin: true
-
   tweetnacl-util@0.15.1:
     resolution: {integrity: sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==}
 
@@ -3315,9 +3169,9 @@ packages:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
 
-  type-fest@0.13.1:
-    resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
-    engines: {node: '>=10'}
+  type-detect@4.1.0:
+    resolution: {integrity: sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==}
+    engines: {node: '>=4'}
 
   type-fest@0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
@@ -3327,18 +3181,10 @@ packages:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
 
-  type-fest@0.6.0:
-    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
-    engines: {node: '>=8'}
-
   type-fest@0.7.1:
     resolution: {integrity: sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==}
     engines: {node: '>=8'}
 
-  type-fest@0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: '>=8'}
-
   typechain@8.3.2:
     resolution: {integrity: sha512-x/sQYr5w9K7yv3es7jo4KTX05CLxOf7TRWwoHlrjRh8H82G64g+k7VuWPJlgMo6qrjfCulOdfBjiaDtmhFYD/Q==}
     hasBin: true
@@ -3376,8 +3222,8 @@ packages:
     resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
     engines: {node: '>= 0.4'}
 
-  typescript@5.4.5:
-    resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==}
+  typescript@5.5.4:
+    resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -3433,12 +3279,6 @@ packages:
   v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
-  validate-npm-package-license@3.0.4:
-    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
-
-  wcwidth@1.0.1:
-    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
-
   web3-utils@1.7.4:
     resolution: {integrity: sha512-acBdm6Evd0TEZRnChM/MCvGsMwYKmSh7OaUfNf5OKG0CIeGWD/6gqLOWIwmwSnre/2WrA1nKGId5uW2e5EfluA==}
     engines: {node: '>=8.0.0'}
@@ -3452,9 +3292,6 @@ packages:
   which-boxed-primitive@1.0.2:
     resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
 
-  which-module@2.0.0:
-    resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
-
   which-pm@2.0.0:
     resolution: {integrity: sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==}
     engines: {node: '>=8.15'}
@@ -3487,10 +3324,6 @@ packages:
   workerpool@6.2.1:
     resolution: {integrity: sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==}
 
-  wrap-ansi@6.2.0:
-    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
-    engines: {node: '>=8'}
-
   wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
@@ -3526,9 +3359,6 @@ packages:
       utf-8-validate:
         optional: true
 
-  y18n@4.0.3:
-    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
-
   y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
@@ -3540,38 +3370,23 @@ packages:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
 
-  yaml@2.3.4:
-    resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==}
+  yaml@2.5.0:
+    resolution: {integrity: sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==}
     engines: {node: '>= 14'}
-
-  yargs-parser@18.1.3:
-    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
-    engines: {node: '>=6'}
+    hasBin: true
 
   yargs-parser@20.2.4:
     resolution: {integrity: sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==}
     engines: {node: '>=10'}
 
-  yargs-parser@21.1.1:
-    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
-    engines: {node: '>=12'}
-
   yargs-unparser@2.0.0:
     resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==}
     engines: {node: '>=10'}
 
-  yargs@15.4.1:
-    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
-    engines: {node: '>=8'}
-
   yargs@16.2.0:
     resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
     engines: {node: '>=10'}
 
-  yargs@17.7.2:
-    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
-    engines: {node: '>=12'}
-
   yn@3.1.1:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
@@ -3598,7 +3413,7 @@ snapshots:
       '@openzeppelin/contracts': 4.8.3
       '@openzeppelin/contracts-upgradeable': 4.8.3
     optionalDependencies:
-      '@openzeppelin/upgrades-core': 1.32.5
+      '@openzeppelin/upgrades-core': 1.34.4
     transitivePeerDependencies:
       - supports-color
 
@@ -3620,12 +3435,13 @@ snapshots:
 
   '@chainlink/solhint-plugin-chainlink-solidity@https://codeload.github.com/smartcontractkit/chainlink-solhint-rules/tar.gz/1b4c0c2663fcd983589d4f33a2e73908624ed43c': {}
 
-  '@changesets/apply-release-plan@7.0.1':
+  '@changesets/apply-release-plan@7.0.4':
     dependencies:
       '@babel/runtime': 7.24.0
-      '@changesets/config': 3.0.0
+      '@changesets/config': 3.0.2
       '@changesets/get-version-range-type': 0.4.0
       '@changesets/git': 3.0.0
+      '@changesets/should-skip-package': 0.1.0
       '@changesets/types': 6.0.0
       '@manypkg/get-packages': 1.1.3
       detect-indent: 6.1.0
@@ -3634,16 +3450,17 @@ snapshots:
       outdent: 0.5.0
       prettier: 2.8.8
       resolve-from: 5.0.0
-      semver: 7.6.2
+      semver: 7.6.3
 
-  '@changesets/assemble-release-plan@6.0.0':
+  '@changesets/assemble-release-plan@6.0.3':
     dependencies:
       '@babel/runtime': 7.24.0
       '@changesets/errors': 0.2.0
-      '@changesets/get-dependents-graph': 2.0.0
+      '@changesets/get-dependents-graph': 2.1.1
+      '@changesets/should-skip-package': 0.1.0
       '@changesets/types': 6.0.0
       '@manypkg/get-packages': 1.1.3
-      semver: 7.6.2
+      semver: 7.6.3
 
   '@changesets/changelog-git@0.2.0':
     dependencies:
@@ -3657,20 +3474,21 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@changesets/cli@2.27.3':
+  '@changesets/cli@2.27.7':
     dependencies:
       '@babel/runtime': 7.24.0
-      '@changesets/apply-release-plan': 7.0.1
-      '@changesets/assemble-release-plan': 6.0.0
+      '@changesets/apply-release-plan': 7.0.4
+      '@changesets/assemble-release-plan': 6.0.3
       '@changesets/changelog-git': 0.2.0
-      '@changesets/config': 3.0.0
+      '@changesets/config': 3.0.2
       '@changesets/errors': 0.2.0
-      '@changesets/get-dependents-graph': 2.0.0
-      '@changesets/get-release-plan': 4.0.0
+      '@changesets/get-dependents-graph': 2.1.1
+      '@changesets/get-release-plan': 4.0.3
       '@changesets/git': 3.0.0
       '@changesets/logger': 0.1.0
       '@changesets/pre': 2.0.0
       '@changesets/read': 0.6.0
+      '@changesets/should-skip-package': 0.1.0
       '@changesets/types': 6.0.0
       '@changesets/write': 0.3.1
       '@manypkg/get-packages': 1.1.3
@@ -3682,20 +3500,19 @@ snapshots:
       external-editor: 3.1.0
       fs-extra: 7.0.1
       human-id: 1.0.2
-      meow: 6.1.1
+      mri: 1.2.0
       outdent: 0.5.0
       p-limit: 2.3.0
       preferred-pm: 3.1.3
       resolve-from: 5.0.0
-      semver: 7.6.2
+      semver: 7.6.3
       spawndamnit: 2.0.0
       term-size: 2.2.1
-      tty-table: 4.2.3
 
-  '@changesets/config@3.0.0':
+  '@changesets/config@3.0.2':
     dependencies:
       '@changesets/errors': 0.2.0
-      '@changesets/get-dependents-graph': 2.0.0
+      '@changesets/get-dependents-graph': 2.1.1
       '@changesets/logger': 0.1.0
       '@changesets/types': 6.0.0
       '@manypkg/get-packages': 1.1.3
@@ -3706,13 +3523,13 @@ snapshots:
     dependencies:
       extendable-error: 0.1.7
 
-  '@changesets/get-dependents-graph@2.0.0':
+  '@changesets/get-dependents-graph@2.1.1':
     dependencies:
       '@changesets/types': 6.0.0
       '@manypkg/get-packages': 1.1.3
       chalk: 2.4.2
       fs-extra: 7.0.1
-      semver: 7.6.2
+      semver: 7.6.3
 
   '@changesets/get-github-info@0.6.0':
     dependencies:
@@ -3721,11 +3538,11 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@changesets/get-release-plan@4.0.0':
+  '@changesets/get-release-plan@4.0.3':
     dependencies:
       '@babel/runtime': 7.24.0
-      '@changesets/assemble-release-plan': 6.0.0
-      '@changesets/config': 3.0.0
+      '@changesets/assemble-release-plan': 6.0.3
+      '@changesets/config': 3.0.2
       '@changesets/pre': 2.0.0
       '@changesets/read': 0.6.0
       '@changesets/types': 6.0.0
@@ -3771,6 +3588,12 @@ snapshots:
       fs-extra: 7.0.1
       p-filter: 2.1.0
 
+  '@changesets/should-skip-package@0.1.0':
+    dependencies:
+      '@babel/runtime': 7.24.0
+      '@changesets/types': 6.0.0
+      '@manypkg/get-packages': 1.1.3
+
   '@changesets/types@4.1.0': {}
 
   '@changesets/types@6.0.0': {}
@@ -3797,7 +3620,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       espree: 9.6.1
       globals: 13.24.0
       ignore: 5.3.1
@@ -3837,7 +3660,7 @@ snapshots:
       '@ethersproject/transactions': 5.7.0
       '@ethersproject/web': 5.7.1
       bufio: 1.0.7
-      chai: 4.4.1
+      chai: 4.5.0
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -4110,7 +3933,7 @@ snapshots:
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -4188,7 +4011,7 @@ snapshots:
       '@nomicfoundation/ethereumjs-trie': 6.0.4
       '@nomicfoundation/ethereumjs-tx': 5.0.4
       '@nomicfoundation/ethereumjs-util': 9.0.4
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       ethereum-cryptography: 0.1.3
       lru-cache: 10.2.2
     transitivePeerDependencies:
@@ -4218,7 +4041,7 @@ snapshots:
       '@nomicfoundation/ethereumjs-tx': 5.0.4
       '@nomicfoundation/ethereumjs-util': 9.0.4
       '@types/debug': 4.1.12
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       ethereum-cryptography: 0.1.3
       rustbn-wasm: 0.2.0
     transitivePeerDependencies:
@@ -4234,7 +4057,7 @@ snapshots:
       '@nomicfoundation/ethereumjs-rlp': 5.0.4
       '@nomicfoundation/ethereumjs-trie': 6.0.4
       '@nomicfoundation/ethereumjs-util': 9.0.4
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       ethereum-cryptography: 0.1.3
       js-sdsl: 4.4.2
       lru-cache: 10.2.2
@@ -4287,47 +4110,47 @@ snapshots:
       '@nomicfoundation/ethereumjs-trie': 6.0.4
       '@nomicfoundation/ethereumjs-tx': 5.0.4
       '@nomicfoundation/ethereumjs-util': 9.0.4
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       ethereum-cryptography: 0.1.3
     transitivePeerDependencies:
       - '@nomicfoundation/ethereumjs-verkle'
       - c-kzg
       - supports-color
 
-  '@nomicfoundation/hardhat-chai-matchers@1.0.6(@nomiclabs/hardhat-ethers@2.2.3(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)))(chai@4.4.1)(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))':
+  '@nomicfoundation/hardhat-chai-matchers@1.0.6(@nomiclabs/hardhat-ethers@2.2.3(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)))(chai@4.5.0)(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))':
     dependencies:
       '@ethersproject/abi': 5.7.0
-      '@nomiclabs/hardhat-ethers': 2.2.3(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))
+      '@nomiclabs/hardhat-ethers': 2.2.3(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))
       '@types/chai-as-promised': 7.1.8
-      chai: 4.4.1
-      chai-as-promised: 7.1.1(chai@4.4.1)
+      chai: 4.5.0
+      chai-as-promised: 7.1.1(chai@4.5.0)
       deep-eql: 4.1.3
       ethers: 5.7.2
-      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)
+      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)
       ordinal: 1.0.3
 
-  '@nomicfoundation/hardhat-ethers@3.0.6(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))':
+  '@nomicfoundation/hardhat-ethers@3.0.6(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))':
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       ethers: 5.7.2
-      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)
+      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)
       lodash.isequal: 4.5.0
     transitivePeerDependencies:
       - supports-color
 
-  '@nomicfoundation/hardhat-network-helpers@1.0.10(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))':
+  '@nomicfoundation/hardhat-network-helpers@1.0.11(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))':
     dependencies:
       ethereumjs-util: 7.1.5
-      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)
+      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)
 
-  '@nomicfoundation/hardhat-verify@2.0.7(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))':
+  '@nomicfoundation/hardhat-verify@2.0.9(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))':
     dependencies:
       '@ethersproject/abi': 5.7.0
       '@ethersproject/address': 5.7.0
       cbor: 8.1.0
       chalk: 2.4.2
-      debug: 4.3.4(supports-color@8.1.1)
-      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)
+      debug: 4.3.6
+      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)
       lodash.clonedeep: 4.5.0
       semver: 6.3.0
       table: 6.8.1
@@ -4378,10 +4201,10 @@ snapshots:
       '@nomicfoundation/solidity-analyzer-win32-ia32-msvc': 0.1.0
       '@nomicfoundation/solidity-analyzer-win32-x64-msvc': 0.1.0
 
-  '@nomiclabs/hardhat-ethers@2.2.3(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))':
+  '@nomiclabs/hardhat-ethers@2.2.3(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))':
     dependencies:
       ethers: 5.7.2
-      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)
+      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)
 
   '@offchainlabs/upgrade-executor@1.1.0-beta.0':
     dependencies:
@@ -4404,12 +4227,12 @@ snapshots:
 
   '@openzeppelin/contracts@4.9.3': {}
 
-  '@openzeppelin/upgrades-core@1.32.5':
+  '@openzeppelin/upgrades-core@1.34.4':
     dependencies:
       cbor: 9.0.2
       chalk: 4.1.2
-      compare-versions: 6.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      compare-versions: 6.1.1
+      debug: 4.3.6
       ethereumjs-util: 7.1.5
       minimist: 1.2.8
       proper-lockfile: 4.1.2
@@ -4432,9 +4255,9 @@ snapshots:
       '@pnpm/network.ca-file': 1.0.2
       config-chain: 1.1.13
 
-  '@prettier/sync@0.3.0(prettier@3.2.5)':
+  '@prettier/sync@0.3.0(prettier@3.3.3)':
     dependencies:
-      prettier: 3.2.5
+      prettier: 3.3.3
 
   '@scroll-tech/contracts@0.1.0': {}
 
@@ -4519,7 +4342,7 @@ snapshots:
   '@truffle/contract-schema@3.4.10':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
     transitivePeerDependencies:
       - supports-color
 
@@ -4531,51 +4354,51 @@ snapshots:
 
   '@tsconfig/node16@1.0.3': {}
 
-  '@typechain/ethers-v5@7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5)':
+  '@typechain/ethers-v5@7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2(typescript@5.5.4))(typescript@5.5.4)':
     dependencies:
       '@ethersproject/abi': 5.7.0
       '@ethersproject/bytes': 5.7.0
       '@ethersproject/providers': 5.7.2
       ethers: 5.7.2
       lodash: 4.17.21
-      ts-essentials: 7.0.3(typescript@5.4.5)
-      typechain: 8.3.2(typescript@5.4.5)
-      typescript: 5.4.5
+      ts-essentials: 7.0.3(typescript@5.5.4)
+      typechain: 8.3.2(typescript@5.5.4)
+      typescript: 5.5.4
 
-  '@typechain/hardhat@7.0.0(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@typechain/ethers-v5@7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5))(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5))(typechain@8.3.2(typescript@5.4.5))':
+  '@typechain/hardhat@7.0.0(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@typechain/ethers-v5@7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2(typescript@5.5.4))(typescript@5.5.4))(ethers@5.7.2)(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4))(typechain@8.3.2(typescript@5.5.4))':
     dependencies:
       '@ethersproject/abi': 5.7.0
       '@ethersproject/providers': 5.7.2
-      '@typechain/ethers-v5': 7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5)
+      '@typechain/ethers-v5': 7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2(typescript@5.5.4))(typescript@5.5.4)
       ethers: 5.7.2
       fs-extra: 9.1.0
-      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)
-      typechain: 8.3.2(typescript@5.4.5)
+      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)
+      typechain: 8.3.2(typescript@5.5.4)
 
   '@types/bn.js@4.11.6':
     dependencies:
-      '@types/node': 20.12.12
+      '@types/node': 20.14.15
 
   '@types/bn.js@5.1.1':
     dependencies:
-      '@types/node': 20.12.12
+      '@types/node': 20.14.15
 
   '@types/cacheable-request@6.0.2':
     dependencies:
       '@types/http-cache-semantics': 4.0.1
       '@types/keyv': 3.1.4
-      '@types/node': 20.12.12
+      '@types/node': 20.14.15
       '@types/responselike': 1.0.0
 
   '@types/cbor@5.0.1':
     dependencies:
-      '@types/node': 20.12.12
+      '@types/node': 20.14.15
 
   '@types/chai-as-promised@7.1.8':
     dependencies:
-      '@types/chai': 4.3.16
+      '@types/chai': 4.3.17
 
-  '@types/chai@4.3.16': {}
+  '@types/chai@4.3.17': {}
 
   '@types/debug@4.1.12':
     dependencies:
@@ -4587,124 +4410,120 @@ snapshots:
 
   '@types/keyv@3.1.4':
     dependencies:
-      '@types/node': 20.12.12
+      '@types/node': 20.14.15
 
   '@types/lru-cache@5.1.1': {}
 
-  '@types/minimist@1.2.5': {}
-
-  '@types/mocha@10.0.6': {}
+  '@types/mocha@10.0.7': {}
 
   '@types/ms@0.7.31': {}
 
   '@types/node@12.19.16': {}
 
-  '@types/node@20.12.12':
+  '@types/node@20.14.15':
     dependencies:
       undici-types: 5.26.5
 
-  '@types/normalize-package-data@2.4.4': {}
-
   '@types/pbkdf2@3.1.0':
     dependencies:
-      '@types/node': 20.12.12
+      '@types/node': 20.14.15
 
   '@types/prettier@2.7.1': {}
 
   '@types/readable-stream@2.3.15':
     dependencies:
-      '@types/node': 20.12.12
+      '@types/node': 20.14.15
       safe-buffer: 5.1.2
 
   '@types/responselike@1.0.0':
     dependencies:
-      '@types/node': 20.12.12
+      '@types/node': 20.14.15
 
   '@types/secp256k1@4.0.3':
     dependencies:
-      '@types/node': 20.12.12
+      '@types/node': 20.14.15
 
   '@types/semver@7.5.0': {}
 
-  '@typescript-eslint/eslint-plugin@7.10.0(@typescript-eslint/parser@7.10.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)':
+  '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)':
     dependencies:
       '@eslint-community/regexpp': 4.10.0
-      '@typescript-eslint/parser': 7.10.0(eslint@8.57.0)(typescript@5.4.5)
-      '@typescript-eslint/scope-manager': 7.10.0
-      '@typescript-eslint/type-utils': 7.10.0(eslint@8.57.0)(typescript@5.4.5)
-      '@typescript-eslint/utils': 7.10.0(eslint@8.57.0)(typescript@5.4.5)
-      '@typescript-eslint/visitor-keys': 7.10.0
+      '@typescript-eslint/parser': 7.18.0(eslint@8.57.0)(typescript@5.5.4)
+      '@typescript-eslint/scope-manager': 7.18.0
+      '@typescript-eslint/type-utils': 7.18.0(eslint@8.57.0)(typescript@5.5.4)
+      '@typescript-eslint/utils': 7.18.0(eslint@8.57.0)(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 7.18.0
       eslint: 8.57.0
       graphemer: 1.4.0
       ignore: 5.3.1
       natural-compare: 1.4.0
-      ts-api-utils: 1.3.0(typescript@5.4.5)
+      ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
-      typescript: 5.4.5
+      typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@7.10.0(eslint@8.57.0)(typescript@5.4.5)':
+  '@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/scope-manager': 7.10.0
-      '@typescript-eslint/types': 7.10.0
-      '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.4.5)
-      '@typescript-eslint/visitor-keys': 7.10.0
-      debug: 4.3.4(supports-color@8.1.1)
+      '@typescript-eslint/scope-manager': 7.18.0
+      '@typescript-eslint/types': 7.18.0
+      '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 7.18.0
+      debug: 4.3.6
       eslint: 8.57.0
     optionalDependencies:
-      typescript: 5.4.5
+      typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/scope-manager@7.10.0':
+  '@typescript-eslint/scope-manager@7.18.0':
     dependencies:
-      '@typescript-eslint/types': 7.10.0
-      '@typescript-eslint/visitor-keys': 7.10.0
+      '@typescript-eslint/types': 7.18.0
+      '@typescript-eslint/visitor-keys': 7.18.0
 
-  '@typescript-eslint/type-utils@7.10.0(eslint@8.57.0)(typescript@5.4.5)':
+  '@typescript-eslint/type-utils@7.18.0(eslint@8.57.0)(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.4.5)
-      '@typescript-eslint/utils': 7.10.0(eslint@8.57.0)(typescript@5.4.5)
-      debug: 4.3.4(supports-color@8.1.1)
+      '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.5.4)
+      '@typescript-eslint/utils': 7.18.0(eslint@8.57.0)(typescript@5.5.4)
+      debug: 4.3.6
       eslint: 8.57.0
-      ts-api-utils: 1.3.0(typescript@5.4.5)
+      ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
-      typescript: 5.4.5
+      typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@7.10.0': {}
+  '@typescript-eslint/types@7.18.0': {}
 
-  '@typescript-eslint/typescript-estree@7.10.0(typescript@5.4.5)':
+  '@typescript-eslint/typescript-estree@7.18.0(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/types': 7.10.0
-      '@typescript-eslint/visitor-keys': 7.10.0
-      debug: 4.3.4(supports-color@8.1.1)
+      '@typescript-eslint/types': 7.18.0
+      '@typescript-eslint/visitor-keys': 7.18.0
+      debug: 4.3.6
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.4
-      semver: 7.6.2
-      ts-api-utils: 1.3.0(typescript@5.4.5)
+      semver: 7.6.3
+      ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
-      typescript: 5.4.5
+      typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@7.10.0(eslint@8.57.0)(typescript@5.4.5)':
+  '@typescript-eslint/utils@7.18.0(eslint@8.57.0)(typescript@5.5.4)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
-      '@typescript-eslint/scope-manager': 7.10.0
-      '@typescript-eslint/types': 7.10.0
-      '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.4.5)
+      '@typescript-eslint/scope-manager': 7.18.0
+      '@typescript-eslint/types': 7.18.0
+      '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.5.4)
       eslint: 8.57.0
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@typescript-eslint/visitor-keys@7.10.0':
+  '@typescript-eslint/visitor-keys@7.18.0':
     dependencies:
-      '@typescript-eslint/types': 7.10.0
+      '@typescript-eslint/types': 7.18.0
       eslint-visitor-keys: 3.4.3
 
   '@ungap/structured-clone@1.2.0': {}
@@ -4718,7 +4537,7 @@ snapshots:
       ajv: 6.12.6
       better-ajv-errors: 0.8.2(ajv@6.12.6)
       neodoc: 2.0.2
-      semver: 7.6.2
+      semver: 7.6.3
       source-map-support: 0.5.21
     optionalDependencies:
       prettier: 2.8.8
@@ -4742,7 +4561,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
     transitivePeerDependencies:
       - supports-color
 
@@ -4777,7 +4596,9 @@ snapshots:
     dependencies:
       type-fest: 0.21.3
 
-  ansi-escapes@6.2.1: {}
+  ansi-escapes@7.0.0:
+    dependencies:
+      environment: 1.1.0
 
   ansi-regex@2.1.1: {}
 
@@ -4818,6 +4639,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.5
       is-array-buffer: 3.0.2
+    optional: true
 
   array-buffer-byte-length@1.0.1:
     dependencies:
@@ -4837,13 +4659,6 @@ snapshots:
       es-shim-unscopables: 1.0.2
     optional: true
 
-  array.prototype.flat@1.3.2:
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-      es-shim-unscopables: 1.0.2
-
   arraybuffer.prototype.slice@1.0.2:
     dependencies:
       array-buffer-byte-length: 1.0.0
@@ -4853,6 +4668,7 @@ snapshots:
       get-intrinsic: 1.2.2
       is-array-buffer: 3.0.2
       is-shared-array-buffer: 1.0.2
+    optional: true
 
   arraybuffer.prototype.slice@1.0.3:
     dependencies:
@@ -4866,8 +4682,6 @@ snapshots:
       is-shared-array-buffer: 1.0.3
     optional: true
 
-  arrify@1.0.1: {}
-
   assertion-error@1.1.0: {}
 
   ast-parents@0.0.1: {}
@@ -4876,7 +4690,8 @@ snapshots:
 
   at-least-node@1.0.0: {}
 
-  available-typed-arrays@1.0.5: {}
+  available-typed-arrays@1.0.5:
+    optional: true
 
   available-typed-arrays@1.0.7:
     dependencies:
@@ -4944,9 +4759,9 @@ snapshots:
     dependencies:
       fill-range: 7.0.1
 
-  breakword@1.0.6:
+  braces@3.0.3:
     dependencies:
-      wcwidth: 1.0.1
+      fill-range: 7.1.1
 
   brorand@1.1.0: {}
 
@@ -4986,7 +4801,7 @@ snapshots:
       clone-response: 1.0.2
       get-stream: 5.1.0
       http-cache-semantics: 4.0.3
-      keyv: 4.5.0
+      keyv: 4.5.4
       lowercase-keys: 2.0.0
       normalize-url: 6.1.0
       responselike: 2.0.1
@@ -4996,6 +4811,7 @@ snapshots:
       function-bind: 1.1.2
       get-intrinsic: 1.2.2
       set-function-length: 1.1.1
+    optional: true
 
   call-bind@1.0.7:
     dependencies:
@@ -5013,14 +4829,6 @@ snapshots:
       no-case: 2.3.2
       upper-case: 1.1.3
 
-  camelcase-keys@6.2.2:
-    dependencies:
-      camelcase: 5.3.1
-      map-obj: 4.3.0
-      quick-lru: 4.0.1
-
-  camelcase@5.3.1: {}
-
   camelcase@6.3.0: {}
 
   cbor@5.2.0:
@@ -5037,12 +4845,12 @@ snapshots:
       nofilter: 3.1.0
     optional: true
 
-  chai-as-promised@7.1.1(chai@4.4.1):
+  chai-as-promised@7.1.1(chai@4.5.0):
     dependencies:
-      chai: 4.4.1
+      chai: 4.5.0
       check-error: 1.0.3
 
-  chai@4.4.1:
+  chai@4.5.0:
     dependencies:
       assertion-error: 1.1.0
       check-error: 1.0.3
@@ -5050,7 +4858,7 @@ snapshots:
       get-func-name: 2.0.2
       loupe: 2.3.7
       pathval: 1.1.1
-      type-detect: 4.0.8
+      type-detect: 4.1.0
 
   chalk@2.4.2:
     dependencies:
@@ -5117,20 +4925,14 @@ snapshots:
 
   cli-boxes@2.2.1: {}
 
-  cli-cursor@4.0.0:
+  cli-cursor@5.0.0:
     dependencies:
-      restore-cursor: 4.0.0
+      restore-cursor: 5.1.0
 
   cli-truncate@4.0.0:
     dependencies:
       slice-ansi: 5.0.0
-      string-width: 7.1.0
-
-  cliui@6.0.0:
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 6.2.0
+      string-width: 7.2.0
 
   cliui@7.0.4:
     dependencies:
@@ -5138,18 +4940,10 @@ snapshots:
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
 
-  cliui@8.0.1:
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
-
   clone-response@1.0.2:
     dependencies:
       mimic-response: 1.0.1
 
-  clone@1.0.4: {}
-
   code-error-fragment@0.0.230: {}
 
   color-convert@1.9.3:
@@ -5184,11 +4978,11 @@ snapshots:
 
   commander@10.0.1: {}
 
-  commander@11.1.0: {}
+  commander@12.1.0: {}
 
   commander@3.0.2: {}
 
-  compare-versions@6.1.0:
+  compare-versions@6.1.1:
     optional: true
 
   concat-map@0.0.1: {}
@@ -5253,19 +5047,6 @@ snapshots:
       shebang-command: 2.0.0
       which: 2.0.2
 
-  csv-generate@3.4.3: {}
-
-  csv-parse@4.16.3: {}
-
-  csv-stringify@5.6.5: {}
-
-  csv@5.5.3:
-    dependencies:
-      csv-generate: 3.4.3
-      csv-parse: 4.16.3
-      csv-stringify: 5.6.5
-      stream-transform: 2.1.3
-
   data-view-buffer@1.0.1:
     dependencies:
       call-bind: 1.0.7
@@ -5295,12 +5076,9 @@ snapshots:
     optionalDependencies:
       supports-color: 8.1.1
 
-  decamelize-keys@1.1.1:
+  debug@4.3.6:
     dependencies:
-      decamelize: 1.2.0
-      map-obj: 1.0.1
-
-  decamelize@1.2.0: {}
+      ms: 2.1.2
 
   decamelize@4.0.0: {}
 
@@ -5321,10 +5099,6 @@ snapshots:
 
   deep-is@0.1.4: {}
 
-  defaults@1.0.4:
-    dependencies:
-      clone: 1.0.4
-
   defer-to-connect@2.0.1: {}
 
   define-data-property@1.1.1:
@@ -5332,6 +5106,7 @@ snapshots:
       get-intrinsic: 1.2.2
       gopd: 1.0.1
       has-property-descriptors: 1.0.0
+    optional: true
 
   define-data-property@1.1.4:
     dependencies:
@@ -5345,6 +5120,7 @@ snapshots:
       define-data-property: 1.1.1
       has-property-descriptors: 1.0.0
       object-keys: 1.1.1
+    optional: true
 
   delete-empty@3.0.0:
     dependencies:
@@ -5385,7 +5161,7 @@ snapshots:
       minimalistic-assert: 1.0.1
       minimalistic-crypto-utils: 1.0.1
 
-  emoji-regex@10.3.0: {}
+  emoji-regex@10.4.0: {}
 
   emoji-regex@8.0.0: {}
 
@@ -5399,6 +5175,8 @@ snapshots:
 
   env-paths@2.2.1: {}
 
+  environment@1.1.0: {}
+
   error-ex@1.3.2:
     dependencies:
       is-arrayish: 0.2.1
@@ -5444,6 +5222,7 @@ snapshots:
       typed-array-length: 1.0.4
       unbox-primitive: 1.0.2
       which-typed-array: 1.1.13
+    optional: true
 
   es-abstract@1.23.3:
     dependencies:
@@ -5513,6 +5292,7 @@ snapshots:
       get-intrinsic: 1.2.2
       has-tostringtag: 1.0.0
       hasown: 2.0.0
+    optional: true
 
   es-set-tostringtag@2.0.3:
     dependencies:
@@ -5524,12 +5304,14 @@ snapshots:
   es-shim-unscopables@1.0.2:
     dependencies:
       hasown: 2.0.0
+    optional: true
 
   es-to-primitive@1.2.1:
     dependencies:
       is-callable: 1.2.7
       is-date-object: 1.0.2
       is-symbol: 1.0.3
+    optional: true
 
   escalade@3.1.1: {}
 
@@ -5541,12 +5323,12 @@ snapshots:
     dependencies:
       eslint: 8.57.0
 
-  eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5):
+  eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.3):
     dependencies:
       eslint: 8.57.0
-      prettier: 3.2.5
+      prettier: 3.3.3
       prettier-linter-helpers: 1.0.0
-      synckit: 0.8.8
+      synckit: 0.9.1
     optionalDependencies:
       eslint-config-prettier: 9.1.0(eslint@8.57.0)
 
@@ -5570,7 +5352,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -5777,6 +5559,10 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+
   find-replace@3.0.0:
     dependencies:
       array-back: 3.1.0
@@ -5814,13 +5600,14 @@ snapshots:
 
   flatted@3.3.1: {}
 
-  follow-redirects@1.15.6(debug@4.3.4):
+  follow-redirects@1.15.6(debug@4.3.6):
     optionalDependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
 
   for-each@0.3.3:
     dependencies:
       is-callable: 1.2.7
+    optional: true
 
   form-data-encoder@1.7.1: {}
 
@@ -5858,7 +5645,8 @@ snapshots:
   fsevents@2.3.2:
     optional: true
 
-  function-bind@1.1.2: {}
+  function-bind@1.1.2:
+    optional: true
 
   function.prototype.name@1.1.6:
     dependencies:
@@ -5866,8 +5654,10 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.22.3
       functions-have-names: 1.2.3
+    optional: true
 
-  functions-have-names@1.2.3: {}
+  functions-have-names@1.2.3:
+    optional: true
 
   get-caller-file@2.0.5: {}
 
@@ -5881,6 +5671,7 @@ snapshots:
       has-proto: 1.0.1
       has-symbols: 1.0.3
       hasown: 2.0.0
+    optional: true
 
   get-intrinsic@1.2.4:
     dependencies:
@@ -5903,6 +5694,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.5
       get-intrinsic: 1.2.2
+    optional: true
 
   get-symbol-description@1.0.2:
     dependencies:
@@ -5961,6 +5753,7 @@ snapshots:
   globalthis@1.0.3:
     dependencies:
       define-properties: 1.2.1
+    optional: true
 
   globby@11.1.0:
     dependencies:
@@ -5974,6 +5767,7 @@ snapshots:
   gopd@1.0.1:
     dependencies:
       get-intrinsic: 1.2.2
+    optional: true
 
   got@12.1.0:
     dependencies:
@@ -5997,13 +5791,11 @@ snapshots:
 
   graphemer@1.4.0: {}
 
-  hard-rejection@2.1.0: {}
-
-  hardhat-abi-exporter@2.10.1(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)):
+  hardhat-abi-exporter@2.10.1(hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)):
     dependencies:
       '@ethersproject/abi': 5.7.0
       delete-empty: 3.0.0
-      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5)
+      hardhat: 2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4)
 
   hardhat-ignore-warnings@0.2.11:
     dependencies:
@@ -6011,7 +5803,7 @@ snapshots:
       node-interval-tree: 2.1.2
       solidity-comments: 0.0.2
 
-  hardhat@2.20.1(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))(typescript@5.4.5):
+  hardhat@2.20.1(ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4))(typescript@5.5.4):
     dependencies:
       '@ethersproject/abi': 5.7.0
       '@metamask/eth-sig-util': 4.0.1
@@ -6037,7 +5829,7 @@ snapshots:
       chalk: 2.4.2
       chokidar: 3.5.3
       ci-info: 2.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       enquirer: 2.3.6
       env-paths: 2.2.1
       ethereum-cryptography: 1.1.2
@@ -6056,7 +5848,7 @@ snapshots:
       raw-body: 2.5.1
       resolve: 1.17.0
       semver: 6.3.0
-      solc: 0.7.3(debug@4.3.4)
+      solc: 0.7.3(debug@4.3.6)
       source-map-support: 0.5.21
       stacktrace-parser: 0.1.10
       tsort: 0.0.1
@@ -6064,15 +5856,16 @@ snapshots:
       uuid: 8.3.2
       ws: 7.5.9
     optionalDependencies:
-      ts-node: 10.9.2(@types/node@20.12.12)(typescript@5.4.5)
-      typescript: 5.4.5
+      ts-node: 10.9.2(@types/node@20.14.15)(typescript@5.5.4)
+      typescript: 5.5.4
     transitivePeerDependencies:
       - bufferutil
       - c-kzg
       - supports-color
       - utf-8-validate
 
-  has-bigints@1.0.2: {}
+  has-bigints@1.0.2:
+    optional: true
 
   has-flag@3.0.0: {}
 
@@ -6081,32 +5874,32 @@ snapshots:
   has-property-descriptors@1.0.0:
     dependencies:
       get-intrinsic: 1.2.2
+    optional: true
 
   has-property-descriptors@1.0.2:
     dependencies:
       es-define-property: 1.0.0
     optional: true
 
-  has-proto@1.0.1: {}
+  has-proto@1.0.1:
+    optional: true
 
   has-proto@1.0.3:
     optional: true
 
-  has-symbols@1.0.3: {}
+  has-symbols@1.0.3:
+    optional: true
 
   has-tostringtag@1.0.0:
     dependencies:
       has-symbols: 1.0.3
+    optional: true
 
   has-tostringtag@1.0.2:
     dependencies:
       has-symbols: 1.0.3
     optional: true
 
-  has@1.0.3:
-    dependencies:
-      function-bind: 1.1.2
-
   hash-base@3.1.0:
     dependencies:
       inherits: 2.0.4
@@ -6121,6 +5914,7 @@ snapshots:
   hasown@2.0.0:
     dependencies:
       function-bind: 1.1.2
+    optional: true
 
   hasown@2.0.2:
     dependencies:
@@ -6140,8 +5934,6 @@ snapshots:
       minimalistic-assert: 1.0.1
       minimalistic-crypto-utils: 1.0.1
 
-  hosted-git-info@2.8.9: {}
-
   http-cache-semantics@4.0.3: {}
 
   http-errors@2.0.0:
@@ -6160,7 +5952,7 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
     transitivePeerDependencies:
       - supports-color
 
@@ -6168,7 +5960,7 @@ snapshots:
 
   human-signals@5.0.0: {}
 
-  husky@9.0.11: {}
+  husky@9.1.5: {}
 
   iconv-lite@0.4.24:
     dependencies:
@@ -6203,6 +5995,7 @@ snapshots:
       get-intrinsic: 1.2.2
       hasown: 2.0.0
       side-channel: 1.0.4
+    optional: true
 
   internal-slot@1.0.7:
     dependencies:
@@ -6220,6 +6013,7 @@ snapshots:
       call-bind: 1.0.5
       get-intrinsic: 1.2.2
       is-typed-array: 1.1.12
+    optional: true
 
   is-array-buffer@3.0.4:
     dependencies:
@@ -6232,6 +6026,7 @@ snapshots:
   is-bigint@1.0.4:
     dependencies:
       has-bigints: 1.0.2
+    optional: true
 
   is-binary-path@2.1.0:
     dependencies:
@@ -6241,23 +6036,22 @@ snapshots:
     dependencies:
       call-bind: 1.0.5
       has-tostringtag: 1.0.0
+    optional: true
 
-  is-callable@1.2.7: {}
+  is-callable@1.2.7:
+    optional: true
 
   is-ci@2.0.0:
     dependencies:
       ci-info: 2.0.0
 
-  is-core-module@2.10.0:
-    dependencies:
-      has: 1.0.3
-
   is-data-view@1.0.1:
     dependencies:
       is-typed-array: 1.1.13
     optional: true
 
-  is-date-object@1.0.2: {}
+  is-date-object@1.0.2:
+    optional: true
 
   is-docker@2.2.1: {}
 
@@ -6281,7 +6075,8 @@ snapshots:
     dependencies:
       lower-case: 1.1.4
 
-  is-negative-zero@2.0.2: {}
+  is-negative-zero@2.0.2:
+    optional: true
 
   is-negative-zero@2.0.3:
     optional: true
@@ -6289,23 +6084,24 @@ snapshots:
   is-number-object@1.0.7:
     dependencies:
       has-tostringtag: 1.0.0
+    optional: true
 
   is-number@7.0.0: {}
 
   is-path-inside@3.0.3: {}
 
-  is-plain-obj@1.1.0: {}
-
   is-plain-obj@2.1.0: {}
 
   is-regex@1.1.4:
     dependencies:
       call-bind: 1.0.5
       has-tostringtag: 1.0.0
+    optional: true
 
   is-shared-array-buffer@1.0.2:
     dependencies:
       call-bind: 1.0.5
+    optional: true
 
   is-shared-array-buffer@1.0.3:
     dependencies:
@@ -6317,6 +6113,7 @@ snapshots:
   is-string@1.0.7:
     dependencies:
       has-tostringtag: 1.0.0
+    optional: true
 
   is-subdir@1.2.0:
     dependencies:
@@ -6325,10 +6122,12 @@ snapshots:
   is-symbol@1.0.3:
     dependencies:
       has-symbols: 1.0.3
+    optional: true
 
   is-typed-array@1.1.12:
     dependencies:
       which-typed-array: 1.1.13
+    optional: true
 
   is-typed-array@1.1.13:
     dependencies:
@@ -6344,6 +6143,7 @@ snapshots:
   is-weakref@1.0.2:
     dependencies:
       call-bind: 1.0.5
+    optional: true
 
   is-windows@1.0.2: {}
 
@@ -6351,7 +6151,8 @@ snapshots:
     dependencies:
       is-docker: 2.2.1
 
-  isarray@2.0.5: {}
+  isarray@2.0.5:
+    optional: true
 
   isexe@2.0.0: {}
 
@@ -6407,16 +6208,10 @@ snapshots:
       node-gyp-build: 4.5.0
       readable-stream: 3.6.0
 
-  keyv@4.5.0:
-    dependencies:
-      json-buffer: 3.0.1
-
   keyv@4.5.4:
     dependencies:
       json-buffer: 3.0.1
 
-  kind-of@6.0.3: {}
-
   klaw-sync@6.0.0:
     dependencies:
       graceful-fs: 4.2.10
@@ -6425,8 +6220,6 @@ snapshots:
     optionalDependencies:
       graceful-fs: 4.2.10
 
-  kleur@4.1.5: {}
-
   latest-version@7.0.0:
     dependencies:
       package-json: 8.1.1
@@ -6438,32 +6231,32 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  lilconfig@3.0.0: {}
+  lilconfig@3.1.2: {}
 
   lines-and-columns@1.2.4: {}
 
-  lint-staged@15.2.2:
+  lint-staged@15.2.9:
     dependencies:
       chalk: 5.3.0
-      commander: 11.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      commander: 12.1.0
+      debug: 4.3.6
       execa: 8.0.1
-      lilconfig: 3.0.0
-      listr2: 8.0.1
-      micromatch: 4.0.5
+      lilconfig: 3.1.2
+      listr2: 8.2.4
+      micromatch: 4.0.8
       pidtree: 0.6.0
       string-argv: 0.3.2
-      yaml: 2.3.4
+      yaml: 2.5.0
     transitivePeerDependencies:
       - supports-color
 
-  listr2@8.0.1:
+  listr2@8.2.4:
     dependencies:
       cli-truncate: 4.0.0
       colorette: 2.0.20
       eventemitter3: 5.0.1
-      log-update: 6.0.0
-      rfdc: 1.3.1
+      log-update: 6.1.0
+      rfdc: 1.4.1
       wrap-ansi: 9.0.0
 
   load-yaml-file@0.2.0:
@@ -6507,10 +6300,10 @@ snapshots:
       chalk: 4.1.2
       is-unicode-supported: 0.1.0
 
-  log-update@6.0.0:
+  log-update@6.1.0:
     dependencies:
-      ansi-escapes: 6.2.1
-      cli-cursor: 4.0.0
+      ansi-escapes: 7.0.0
+      cli-cursor: 5.0.0
       slice-ansi: 7.1.0
       strip-ansi: 7.1.0
       wrap-ansi: 9.0.0
@@ -6540,10 +6333,6 @@ snapshots:
 
   make-error@1.3.6: {}
 
-  map-obj@1.0.1: {}
-
-  map-obj@4.3.0: {}
-
   md5.js@1.3.5:
     dependencies:
       hash-base: 3.1.0
@@ -6552,20 +6341,6 @@ snapshots:
 
   memorystream@0.3.1: {}
 
-  meow@6.1.1:
-    dependencies:
-      '@types/minimist': 1.2.5
-      camelcase-keys: 6.2.2
-      decamelize-keys: 1.1.1
-      hard-rejection: 2.1.0
-      minimist-options: 4.1.0
-      normalize-package-data: 2.5.0
-      read-pkg-up: 7.0.1
-      redent: 3.0.0
-      trim-newlines: 3.0.1
-      type-fest: 0.13.1
-      yargs-parser: 18.1.3
-
   merge-stream@2.0.0: {}
 
   merge2@1.4.1: {}
@@ -6575,16 +6350,19 @@ snapshots:
       braces: 3.0.2
       picomatch: 2.3.1
 
-  mimic-fn@2.1.0: {}
+  micromatch@4.0.8:
+    dependencies:
+      braces: 3.0.3
+      picomatch: 2.3.1
 
   mimic-fn@4.0.0: {}
 
+  mimic-function@5.0.1: {}
+
   mimic-response@1.0.1: {}
 
   mimic-response@3.1.0: {}
 
-  min-indent@1.0.1: {}
-
   minimalistic-assert@1.0.1: {}
 
   minimalistic-crypto-utils@1.0.1: {}
@@ -6605,16 +6383,8 @@ snapshots:
     dependencies:
       brace-expansion: 2.0.1
 
-  minimist-options@4.1.0:
-    dependencies:
-      arrify: 1.0.1
-      is-plain-obj: 1.1.0
-      kind-of: 6.0.3
-
   minimist@1.2.8: {}
 
-  mixme@0.5.10: {}
-
   mkdirp@1.0.4: {}
 
   mnemonist@0.38.5:
@@ -6647,6 +6417,8 @@ snapshots:
 
   moment@2.30.1: {}
 
+  mri@1.2.0: {}
+
   ms@2.1.2: {}
 
   ms@2.1.3: {}
@@ -6681,13 +6453,6 @@ snapshots:
 
   nofilter@3.1.0: {}
 
-  normalize-package-data@2.5.0:
-    dependencies:
-      hosted-git-info: 2.8.9
-      resolve: 1.22.1
-      semver: 5.7.1
-      validate-npm-package-license: 3.0.4
-
   normalize-path@3.0.0: {}
 
   normalize-url@6.1.0: {}
@@ -6701,9 +6466,11 @@ snapshots:
       bn.js: 4.11.6
       strip-hex-prefix: 1.0.0
 
-  object-inspect@1.13.1: {}
+  object-inspect@1.13.1:
+    optional: true
 
-  object-keys@1.1.1: {}
+  object-keys@1.1.1:
+    optional: true
 
   object.assign@4.1.4:
     dependencies:
@@ -6711,6 +6478,7 @@ snapshots:
       define-properties: 1.2.1
       has-symbols: 1.0.3
       object-keys: 1.1.1
+    optional: true
 
   object.assign@4.1.5:
     dependencies:
@@ -6726,14 +6494,14 @@ snapshots:
     dependencies:
       wrappy: 1.0.2
 
-  onetime@5.1.2:
-    dependencies:
-      mimic-fn: 2.1.0
-
   onetime@6.0.0:
     dependencies:
       mimic-fn: 4.0.0
 
+  onetime@7.0.0:
+    dependencies:
+      mimic-function: 5.0.1
+
   open@7.4.2:
     dependencies:
       is-docker: 2.2.1
@@ -6799,7 +6567,7 @@ snapshots:
       got: 12.1.0
       registry-auth-token: 5.0.2
       registry-url: 6.0.1
-      semver: 7.6.2
+      semver: 7.6.3
 
   param-case@2.1.1:
     dependencies:
@@ -6902,20 +6670,20 @@ snapshots:
     dependencies:
       '@solidity-parser/parser': 0.17.0
       prettier: 2.8.8
-      semver: 7.6.2
+      semver: 7.6.3
       solidity-comments-extractor: 0.0.8
     optional: true
 
-  prettier-plugin-solidity@1.3.1(prettier@3.2.5):
+  prettier-plugin-solidity@1.3.1(prettier@3.3.3):
     dependencies:
       '@solidity-parser/parser': 0.17.0
-      prettier: 3.2.5
-      semver: 7.6.2
+      prettier: 3.3.3
+      semver: 7.6.3
       solidity-comments-extractor: 0.0.8
 
   prettier@2.8.8: {}
 
-  prettier@3.2.5: {}
+  prettier@3.3.3: {}
 
   proper-lockfile@4.1.2:
     dependencies:
@@ -6937,8 +6705,6 @@ snapshots:
 
   pure-rand@5.0.3: {}
 
-  quick-lru@4.0.1: {}
-
   quick-lru@5.1.1: {}
 
   randombytes@2.1.0:
@@ -6959,19 +6725,6 @@ snapshots:
       minimist: 1.2.8
       strip-json-comments: 2.0.1
 
-  read-pkg-up@7.0.1:
-    dependencies:
-      find-up: 4.1.0
-      read-pkg: 5.2.0
-      type-fest: 0.8.1
-
-  read-pkg@5.2.0:
-    dependencies:
-      '@types/normalize-package-data': 2.4.4
-      normalize-package-data: 2.5.0
-      parse-json: 5.2.0
-      type-fest: 0.6.0
-
   read-yaml-file@1.1.0:
     dependencies:
       graceful-fs: 4.2.10
@@ -6989,11 +6742,6 @@ snapshots:
     dependencies:
       picomatch: 2.3.1
 
-  redent@3.0.0:
-    dependencies:
-      indent-string: 4.0.0
-      strip-indent: 3.0.0
-
   reduce-flatten@2.0.0: {}
 
   regenerator-runtime@0.14.1: {}
@@ -7003,6 +6751,7 @@ snapshots:
       call-bind: 1.0.5
       define-properties: 1.2.1
       set-function-name: 2.0.1
+    optional: true
 
   regexp.prototype.flags@1.5.2:
     dependencies:
@@ -7024,8 +6773,6 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
-  require-main-filename@2.0.0: {}
-
   resolve-alpn@1.2.1: {}
 
   resolve-from@4.0.0: {}
@@ -7036,27 +6783,21 @@ snapshots:
     dependencies:
       path-parse: 1.0.7
 
-  resolve@1.22.1:
-    dependencies:
-      is-core-module: 2.10.0
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
-
   responselike@2.0.1:
     dependencies:
       lowercase-keys: 2.0.0
 
-  restore-cursor@4.0.0:
+  restore-cursor@5.1.0:
     dependencies:
-      onetime: 5.1.2
-      signal-exit: 3.0.7
+      onetime: 7.0.0
+      signal-exit: 4.1.0
 
   retry@0.12.0:
     optional: true
 
   reusify@1.0.4: {}
 
-  rfdc@1.3.1: {}
+  rfdc@1.4.1: {}
 
   rimraf@2.7.1:
     dependencies:
@@ -7089,6 +6830,7 @@ snapshots:
       get-intrinsic: 1.2.2
       has-symbols: 1.0.3
       isarray: 2.0.5
+    optional: true
 
   safe-array-concat@1.1.2:
     dependencies:
@@ -7107,6 +6849,7 @@ snapshots:
       call-bind: 1.0.5
       get-intrinsic: 1.2.2
       is-regex: 1.1.4
+    optional: true
 
   safe-regex-test@1.0.3:
     dependencies:
@@ -7129,7 +6872,7 @@ snapshots:
 
   semver@6.3.0: {}
 
-  semver@7.6.2: {}
+  semver@7.6.3: {}
 
   sentence-case@2.1.1:
     dependencies:
@@ -7140,14 +6883,13 @@ snapshots:
     dependencies:
       randombytes: 2.1.0
 
-  set-blocking@2.0.0: {}
-
   set-function-length@1.1.1:
     dependencies:
       define-data-property: 1.1.1
       get-intrinsic: 1.2.2
       gopd: 1.0.1
       has-property-descriptors: 1.0.0
+    optional: true
 
   set-function-length@1.2.2:
     dependencies:
@@ -7164,6 +6906,7 @@ snapshots:
       define-data-property: 1.1.1
       functions-have-names: 1.2.3
       has-property-descriptors: 1.0.0
+    optional: true
 
   setimmediate@1.0.5: {}
 
@@ -7193,6 +6936,7 @@ snapshots:
       call-bind: 1.0.5
       get-intrinsic: 1.2.2
       object-inspect: 1.13.1
+    optional: true
 
   signal-exit@3.0.7: {}
 
@@ -7218,24 +6962,15 @@ snapshots:
       ansi-styles: 6.2.1
       is-fullwidth-code-point: 5.0.0
 
-  smartwrap@2.0.2:
-    dependencies:
-      array.prototype.flat: 1.3.2
-      breakword: 1.0.6
-      grapheme-splitter: 1.0.4
-      strip-ansi: 6.0.1
-      wcwidth: 1.0.1
-      yargs: 15.4.1
-
   snake-case@2.1.0:
     dependencies:
       no-case: 2.3.2
 
-  solc@0.7.3(debug@4.3.4):
+  solc@0.7.3(debug@4.3.6):
     dependencies:
       command-exists: 1.2.9
       commander: 3.0.2
-      follow-redirects: 1.15.6(debug@4.3.4)
+      follow-redirects: 1.15.6(debug@4.3.6)
       fs-extra: 0.30.0
       js-sha3: 0.8.0
       memorystream: 0.3.1
@@ -7245,14 +6980,14 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  solhint-plugin-prettier@0.1.0(prettier-plugin-solidity@1.3.1(prettier@3.2.5))(prettier@3.2.5):
+  solhint-plugin-prettier@0.1.0(prettier-plugin-solidity@1.3.1(prettier@3.3.3))(prettier@3.3.3):
     dependencies:
-      '@prettier/sync': 0.3.0(prettier@3.2.5)
-      prettier: 3.2.5
+      '@prettier/sync': 0.3.0(prettier@3.3.3)
+      prettier: 3.3.3
       prettier-linter-helpers: 1.0.0
-      prettier-plugin-solidity: 1.3.1(prettier@3.2.5)
+      prettier-plugin-solidity: 1.3.1(prettier@3.3.3)
 
-  solhint@5.0.1:
+  solhint@5.0.3:
     dependencies:
       '@solidity-parser/parser': 0.18.0
       ajv: 6.12.6
@@ -7263,12 +6998,12 @@ snapshots:
       cosmiconfig: 8.2.0
       fast-diff: 1.2.0
       glob: 8.1.0
-      ignore: 5.2.4
+      ignore: 5.3.1
       js-yaml: 4.1.0
       latest-version: 7.0.0
       lodash: 4.17.21
       pluralize: 8.0.0
-      semver: 7.6.2
+      semver: 7.6.3
       strip-ansi: 6.0.1
       table: 6.8.1
       text-table: 0.2.0
@@ -7341,20 +7076,6 @@ snapshots:
       cross-spawn: 5.1.0
       signal-exit: 3.0.7
 
-  spdx-correct@3.1.1:
-    dependencies:
-      spdx-expression-parse: 3.0.1
-      spdx-license-ids: 3.0.12
-
-  spdx-exceptions@2.3.0: {}
-
-  spdx-expression-parse@3.0.1:
-    dependencies:
-      spdx-exceptions: 2.3.0
-      spdx-license-ids: 3.0.12
-
-  spdx-license-ids@3.0.12: {}
-
   sprintf-js@1.0.3: {}
 
   stacktrace-parser@0.1.10:
@@ -7363,10 +7084,6 @@ snapshots:
 
   statuses@2.0.1: {}
 
-  stream-transform@2.1.3:
-    dependencies:
-      mixme: 0.5.10
-
   string-argv@0.3.2: {}
 
   string-format@2.0.0: {}
@@ -7377,9 +7094,9 @@ snapshots:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
-  string-width@7.1.0:
+  string-width@7.2.0:
     dependencies:
-      emoji-regex: 10.3.0
+      emoji-regex: 10.4.0
       get-east-asian-width: 1.2.0
       strip-ansi: 7.1.0
 
@@ -7388,6 +7105,7 @@ snapshots:
       call-bind: 1.0.5
       define-properties: 1.2.1
       es-abstract: 1.22.3
+    optional: true
 
   string.prototype.trim@1.2.9:
     dependencies:
@@ -7402,6 +7120,7 @@ snapshots:
       call-bind: 1.0.5
       define-properties: 1.2.1
       es-abstract: 1.22.3
+    optional: true
 
   string.prototype.trimend@1.0.8:
     dependencies:
@@ -7415,6 +7134,7 @@ snapshots:
       call-bind: 1.0.5
       define-properties: 1.2.1
       es-abstract: 1.22.3
+    optional: true
 
   string.prototype.trimstart@1.0.8:
     dependencies:
@@ -7443,10 +7163,6 @@ snapshots:
     dependencies:
       is-hex-prefixed: 1.0.0
 
-  strip-indent@3.0.0:
-    dependencies:
-      min-indent: 1.0.1
-
   strip-json-comments@2.0.1: {}
 
   strip-json-comments@3.1.1: {}
@@ -7463,14 +7179,12 @@ snapshots:
     dependencies:
       has-flag: 4.0.0
 
-  supports-preserve-symlinks-flag@1.0.0: {}
-
   swap-case@1.1.2:
     dependencies:
       lower-case: 1.1.4
       upper-case: 1.1.3
 
-  synckit@0.8.8:
+  synckit@0.9.1:
     dependencies:
       '@pkgr/core': 0.1.1
       tslib: 2.6.2
@@ -7511,11 +7225,9 @@ snapshots:
 
   tr46@0.0.3: {}
 
-  trim-newlines@3.0.1: {}
-
-  ts-api-utils@1.3.0(typescript@5.4.5):
+  ts-api-utils@1.3.0(typescript@5.5.4):
     dependencies:
-      typescript: 5.4.5
+      typescript: 5.5.4
 
   ts-command-line-args@2.5.1:
     dependencies:
@@ -7524,25 +7236,25 @@ snapshots:
       command-line-usage: 6.1.3
       string-format: 2.0.0
 
-  ts-essentials@7.0.3(typescript@5.4.5):
+  ts-essentials@7.0.3(typescript@5.5.4):
     dependencies:
-      typescript: 5.4.5
+      typescript: 5.5.4
 
-  ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5):
+  ts-node@10.9.2(@types/node@20.14.15)(typescript@5.5.4):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.9
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.3
-      '@types/node': 20.12.12
+      '@types/node': 20.14.15
       acorn: 8.10.0
       acorn-walk: 8.2.0
       arg: 4.1.3
       create-require: 1.1.1
       diff: 4.0.2
       make-error: 1.3.6
-      typescript: 5.4.5
+      typescript: 5.5.4
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
@@ -7552,16 +7264,6 @@ snapshots:
 
   tsort@0.0.1: {}
 
-  tty-table@4.2.3:
-    dependencies:
-      chalk: 4.1.2
-      csv: 5.5.3
-      kleur: 4.1.5
-      smartwrap: 2.0.2
-      strip-ansi: 6.0.1
-      wcwidth: 1.0.1
-      yargs: 17.7.2
-
   tweetnacl-util@0.15.1: {}
 
   tweetnacl@1.0.3: {}
@@ -7572,22 +7274,18 @@ snapshots:
 
   type-detect@4.0.8: {}
 
-  type-fest@0.13.1: {}
+  type-detect@4.1.0: {}
 
   type-fest@0.20.2: {}
 
   type-fest@0.21.3: {}
 
-  type-fest@0.6.0: {}
-
   type-fest@0.7.1: {}
 
-  type-fest@0.8.1: {}
-
-  typechain@8.3.2(typescript@5.4.5):
+  typechain@8.3.2(typescript@5.5.4):
     dependencies:
       '@types/prettier': 2.7.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       fs-extra: 7.0.1
       glob: 7.1.7
       js-sha3: 0.8.0
@@ -7595,8 +7293,8 @@ snapshots:
       mkdirp: 1.0.4
       prettier: 2.8.8
       ts-command-line-args: 2.5.1
-      ts-essentials: 7.0.3(typescript@5.4.5)
-      typescript: 5.4.5
+      ts-essentials: 7.0.3(typescript@5.5.4)
+      typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
@@ -7605,6 +7303,7 @@ snapshots:
       call-bind: 1.0.5
       get-intrinsic: 1.2.2
       is-typed-array: 1.1.12
+    optional: true
 
   typed-array-buffer@1.0.2:
     dependencies:
@@ -7619,6 +7318,7 @@ snapshots:
       for-each: 0.3.3
       has-proto: 1.0.1
       is-typed-array: 1.1.12
+    optional: true
 
   typed-array-byte-length@1.0.1:
     dependencies:
@@ -7636,6 +7336,7 @@ snapshots:
       for-each: 0.3.3
       has-proto: 1.0.1
       is-typed-array: 1.1.12
+    optional: true
 
   typed-array-byte-offset@1.0.2:
     dependencies:
@@ -7652,6 +7353,7 @@ snapshots:
       call-bind: 1.0.5
       for-each: 0.3.3
       is-typed-array: 1.1.12
+    optional: true
 
   typed-array-length@1.0.6:
     dependencies:
@@ -7663,7 +7365,7 @@ snapshots:
       possible-typed-array-names: 1.0.0
     optional: true
 
-  typescript@5.4.5: {}
+  typescript@5.5.4: {}
 
   typical@4.0.0: {}
 
@@ -7675,6 +7377,7 @@ snapshots:
       has-bigints: 1.0.2
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
+    optional: true
 
   undici-types@5.26.5: {}
 
@@ -7706,15 +7409,6 @@ snapshots:
 
   v8-compile-cache-lib@3.0.1: {}
 
-  validate-npm-package-license@3.0.4:
-    dependencies:
-      spdx-correct: 3.1.1
-      spdx-expression-parse: 3.0.1
-
-  wcwidth@1.0.1:
-    dependencies:
-      defaults: 1.0.4
-
   web3-utils@1.7.4:
     dependencies:
       bn.js: 5.2.1
@@ -7739,8 +7433,7 @@ snapshots:
       is-number-object: 1.0.7
       is-string: 1.0.7
       is-symbol: 1.0.3
-
-  which-module@2.0.0: {}
+    optional: true
 
   which-pm@2.0.0:
     dependencies:
@@ -7754,6 +7447,7 @@ snapshots:
       for-each: 0.3.3
       gopd: 1.0.1
       has-tostringtag: 1.0.0
+    optional: true
 
   which-typed-array@1.1.15:
     dependencies:
@@ -7783,12 +7477,6 @@ snapshots:
 
   workerpool@6.2.1: {}
 
-  wrap-ansi@6.2.0:
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-
   wrap-ansi@7.0.0:
     dependencies:
       ansi-styles: 4.3.0
@@ -7798,7 +7486,7 @@ snapshots:
   wrap-ansi@9.0.0:
     dependencies:
       ansi-styles: 6.2.1
-      string-width: 7.1.0
+      string-width: 7.2.0
       strip-ansi: 7.1.0
 
   wrappy@1.0.2: {}
@@ -7807,25 +7495,16 @@ snapshots:
 
   ws@7.5.9: {}
 
-  y18n@4.0.3: {}
-
   y18n@5.0.8: {}
 
   yallist@2.1.2: {}
 
   yaml@1.10.2: {}
 
-  yaml@2.3.4: {}
-
-  yargs-parser@18.1.3:
-    dependencies:
-      camelcase: 5.3.1
-      decamelize: 1.2.0
+  yaml@2.5.0: {}
 
   yargs-parser@20.2.4: {}
 
-  yargs-parser@21.1.1: {}
-
   yargs-unparser@2.0.0:
     dependencies:
       camelcase: 6.3.0
@@ -7833,20 +7512,6 @@ snapshots:
       flat: 5.0.2
       is-plain-obj: 2.1.0
 
-  yargs@15.4.1:
-    dependencies:
-      cliui: 6.0.0
-      decamelize: 1.2.0
-      find-up: 4.1.0
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      require-main-filename: 2.0.0
-      set-blocking: 2.0.0
-      string-width: 4.2.3
-      which-module: 2.0.0
-      y18n: 4.0.3
-      yargs-parser: 18.1.3
-
   yargs@16.2.0:
     dependencies:
       cliui: 7.0.4
@@ -7857,16 +7522,6 @@ snapshots:
       y18n: 5.0.8
       yargs-parser: 20.2.4
 
-  yargs@17.7.2:
-    dependencies:
-      cliui: 8.0.1
-      escalade: 3.1.1
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 21.1.1
-
   yn@3.1.1: {}
 
   yocto-queue@0.1.0: {}
diff --git a/contracts/scripts/ci/generate_slither_report.sh b/contracts/scripts/ci/generate_slither_report.sh
new file mode 100755
index 0000000000..bc876ae118
--- /dev/null
+++ b/contracts/scripts/ci/generate_slither_report.sh
@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+function check_chainlink_dir() {
+  local param_dir="chainlink"
+  current_dir=$(pwd)
+
+  current_base=$(basename "$current_dir")
+
+  if [[ "$current_base" != "$param_dir" ]]; then
+    >&2 echo "The script must be run from the root of $param_dir directory"
+    exit 1
+  fi
+}
+
+check_chainlink_dir
+
+if [ "$#" -lt 5 ]; then
+  >&2 echo "Generates Markdown Slither reports and saves them to a target directory."
+  >&2 echo "Usage: $0 <https://github.com/ORG/REPO/blob/COMMIT/> <config-file> <root-directory-with–contracts> <comma-separated list of contracts> <where-to-save-reports> [slither extra params]"
+  exit 1
+fi
+
+REPO_URL=$1
+CONFIG_FILE=$2
+SOURCE_DIR=$3
+FILES=${4// /}  # Remove any spaces from the list of files
+TARGET_DIR=$5
+SLITHER_EXTRA_PARAMS=$6
+
+run_slither() {
+    local FILE=$1
+    local TARGET_DIR=$2
+
+    if [[ ! -f "$FILE" ]]; then
+      >&2 echo "::error:File not found: $FILE"
+      return 1
+    fi
+
+    set +e
+    source ./contracts/scripts/ci/select_solc_version.sh "$FILE"
+    if [[ $? -ne 0 ]]; then
+        >&2 echo "::error::Failed to select Solc version for $FILE"
+        return 1
+    fi
+
+    SLITHER_OUTPUT_FILE="$TARGET_DIR/$(basename "${FILE%.sol}")-slither-report.md"
+    if ! output=$(slither --config-file "$CONFIG_FILE" "$FILE" --checklist --markdown-root "$REPO_URL" --fail-none $SLITHER_EXTRA_PARAMS); then
+        >&2 echo "::warning::Slither failed for $FILE"
+        return 0
+    fi
+    set -e
+    output=$(echo "$output" | sed '/\*\*THIS CHECKLIST IS NOT COMPLETE\*\*. Use `--show-ignored-findings` to show all the results./d'  | sed '/Summary/d')
+
+    echo "# Summary for $FILE" > "$SLITHER_OUTPUT_FILE"
+    echo "$output" >> "$SLITHER_OUTPUT_FILE"
+
+    if [[ -z "$output" ]]; then
+        echo "No issues found." >> "$SLITHER_OUTPUT_FILE"
+    fi
+}
+
+process_files() {
+    local SOURCE_DIR=$1
+    local TARGET_DIR=$2
+    local FILES=(${3//,/ })  # Split the comma-separated list into an array
+
+    mkdir -p "$TARGET_DIR"
+
+    for FILE in "${FILES[@]}"; do
+      FILE=${FILE//\"/}
+      run_slither "$SOURCE_DIR/$FILE" "$TARGET_DIR"
+    done
+}
+
+set +e
+process_files "$SOURCE_DIR" "$TARGET_DIR" "${FILES[@]}"
+
+if [[ $? -ne 0 ]]; then
+    >&2 echo "::warning::Failed to generate some Slither reports"
+    exit 0
+fi
+
+echo "Slither reports saved in $TARGET_DIR folder"
diff --git a/contracts/scripts/ci/generate_uml.sh b/contracts/scripts/ci/generate_uml.sh
new file mode 100755
index 0000000000..c71d0a1ac7
--- /dev/null
+++ b/contracts/scripts/ci/generate_uml.sh
@@ -0,0 +1,121 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+function check_chainlink_dir() {
+  local param_dir="chainlink"
+  current_dir=$(pwd)
+
+  current_base=$(basename "$current_dir")
+
+  if [[ "$current_base" != "$param_dir" ]]; then
+    >&2 echo "The script must be run from the root of $param_dir directory"
+    exit 1
+  fi
+}
+
+check_chainlink_dir
+
+if [ "$#" -lt 2 ]; then
+    >&2 echo "Generates UML diagrams for all contracts in a directory after flattening them to avoid call stack overflows."
+    >&2 echo "Usage: $0 <path to contracts> <path to target directory> [comma-separated list of files]"
+    exit 1
+fi
+
+SOURCE_DIR="$1"
+TARGET_DIR="$2"
+FILES=${3// /}  # Remove any spaces from the list of files
+FAILED_FILES=()
+
+flatten_and_generate_uml() {
+    local FILE=$1
+    local TARGET_DIR=$2
+
+    set +e
+    FLATTENED_FILE="$TARGET_DIR/flattened_$(basename "$FILE")"
+    echo "::debug::Flattening $FILE to $FLATTENED_FILE"
+    forge flatten "$FILE" -o "$FLATTENED_FILE" --root contracts
+    if [[ $? -ne 0 ]]; then
+        >&2 echo "::error::Failed to flatten $FILE"
+        FAILED_FILES+=("$FILE")
+        return
+    fi
+
+    OUTPUT_FILE=${FLATTENED_FILE//"flattened_"/""}
+    OUTPUT_FILE_SVG="${OUTPUT_FILE%.sol}.svg"
+    echo "::debug::Generating SVG UML for $FLATTENED_FILE to $OUTPUT_FILE_SVG"
+    sol2uml "$FLATTENED_FILE" -o "$OUTPUT_FILE_SVG"
+    if [[ $? -ne 0 ]]; then
+        >&2 echo "::error::Failed to generate UML diagram in SVG format for $FILE"
+        FAILED_FILES+=("$FILE")
+        rm "$FLATTENED_FILE"
+        return
+    fi
+    OUTPUT_FILE_DOT="${OUTPUT_FILE%.sol}.dot"
+    echo "::debug::Generating DOT UML for $FLATTENED_FILE to $OUTPUT_FILE_DOT"
+    sol2uml "$FLATTENED_FILE" -o "$OUTPUT_FILE_DOT" -f dot
+    if [[ $? -ne 0 ]]; then
+        >&2 echo "::error::Failed to generate UML diagram in DOT format for $FILE"
+        FAILED_FILES+=("$FILE")
+        rm "$FLATTENED_FILE"
+        return
+    fi
+
+    rm "$FLATTENED_FILE"
+    set -e
+}
+
+process_all_files_in_directory() {
+    local SOURCE_DIR=$1
+    local TARGET_DIR=$2
+
+    mkdir -p "$TARGET_DIR"
+
+    find "$SOURCE_DIR" -type f -name '*.sol' | while read -r ITEM; do
+        flatten_and_generate_uml "$ITEM" "$TARGET_DIR"
+    done
+}
+
+process_selected_files() {
+    local SOURCE_DIR=$1
+    local TARGET_DIR=$2
+    local FILES=(${3//,/ })  # Split the comma-separated list into an array
+
+    mkdir -p "$TARGET_DIR"
+
+    for FILE in "${FILES[@]}"; do
+        FILE=${FILE//\"/}
+        MATCHES=($(find "$SOURCE_DIR" -type f -path "*/$FILE"))
+
+        if [[ ${#MATCHES[@]} -gt 1 ]]; then
+            >&2 echo "::error:: Multiple matches found for $FILE:"
+            for MATCH in "${MATCHES[@]}"; do
+                >&2 echo "  $MATCH"
+            done
+            exit 1
+        elif [[ ${#MATCHES[@]} -eq 1 ]]; then
+            >&2 echo "::debug::File found: ${MATCHES[0]}"
+            flatten_and_generate_uml "${MATCHES[0]}" "$TARGET_DIR"
+        else
+            >&2 echo "::error::File $FILE does not exist within the source directory $SOURCE_DIR."
+            exit 1
+        fi
+    done
+}
+
+# if FILES is empty, process all files in the directory, otherwise process only the selected files
+if [[ -z "$FILES" ]]; then
+    process_all_files_in_directory "$SOURCE_DIR" "$TARGET_DIR"
+else
+    process_selected_files "$SOURCE_DIR" "$TARGET_DIR" "$FILES"
+fi
+
+if [[ "${#FAILED_FILES[@]}" -gt 0 ]]; then
+    >&2 echo ":error::Failed to generate UML diagrams for ${#FAILED_FILES[@]} files:"
+    for FILE in "${FAILED_FILES[@]}"; do
+        >&2 echo "  $FILE"
+        echo "$FILE" >> "$TARGET_DIR/uml_generation_failures.txt"
+    done
+fi
+
+echo "UML diagrams saved in $TARGET_DIR folder"
diff --git a/contracts/scripts/ci/modify_remappings.sh b/contracts/scripts/ci/modify_remappings.sh
new file mode 100755
index 0000000000..e64ca369b0
--- /dev/null
+++ b/contracts/scripts/ci/modify_remappings.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [ "$#" -ne 2 ]; then
+    >&2 echo "Usage: $0 <directory_prefix> <remappings_file>"
+    exit 1
+fi
+
+DIR_PREFIX=$1
+REMAPPINGS_FILE=$2
+
+if [ ! -f "$REMAPPINGS_FILE" ]; then
+    >&2 echo "::error:: Remappings file '$REMAPPINGS_FILE' not found."
+    exit 1
+fi
+
+OUTPUT_FILE="remappings_modified.txt"
+
+while IFS= read -r line; do
+    if [[ "$line" =~ ^[^=]+= ]]; then
+        REMAPPED_PATH="${line#*=}"
+        MODIFIED_LINE="${line%=*}=${DIR_PREFIX}/${REMAPPED_PATH}"
+        echo "$MODIFIED_LINE" >> "$OUTPUT_FILE"
+    else
+        echo "$line" >> "$OUTPUT_FILE"
+    fi
+done < "$REMAPPINGS_FILE"
+
+echo "Modified remappings have been saved to: $OUTPUT_FILE"
diff --git a/contracts/scripts/ci/select_solc_version.sh b/contracts/scripts/ci/select_solc_version.sh
new file mode 100755
index 0000000000..cfa13de0f6
--- /dev/null
+++ b/contracts/scripts/ci/select_solc_version.sh
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+function check_chainlink_dir() {
+  local param_dir="chainlink"
+  current_dir=$(pwd)
+
+  current_base=$(basename "$current_dir")
+
+  if [[ "$current_base" != "$param_dir" ]]; then
+    >&2 echo "::error::The script must be run from the root of $param_dir directory"
+    exit 1
+  fi
+}
+
+check_chainlink_dir
+
+FILE="$1"
+
+if [[ "$#" -lt 1 ]]; then
+  echo "Detects the Solidity version of a file and selects the appropriate Solc version."
+  echo "If the version is not installed, it will be installed and selected."
+  echo "Will prefer to use the version from Foundry profile if it satisfies the version in the file."
+  echo "Usage: $0 <file>"
+  exit 1
+fi
+
+if [[ -z "$FILE" ]]; then
+  >&2 echo "::error:: File not provided."
+  exit 1
+fi
+
+extract_product() {
+    local path=$1
+
+    echo "$path" | awk -F'src/[^/]*/' '{print $2}' | cut -d'/' -f1
+}
+
+extract_pragma() {
+  local FILE=$1
+
+  if [[ -f "$FILE" ]]; then
+    SOLCVER="$(grep --no-filename '^pragma solidity' "$FILE" | cut -d' ' -f3)"
+  else
+    >&2 echo ":error::$FILE is not a file or it could not be found. Exiting."
+    return 1
+  fi
+  SOLCVER="$(echo "$SOLCVER" | sed 's/[^0-9\.^]//g')"
+  >&2 echo "::debug::Detected Solidity version in pragma: $SOLCVER"
+  echo "$SOLCVER"
+}
+
+echo "Detecting Solc version for $FILE"
+
+# Set FOUNDRY_PROFILE to the product name only if it is set; otherwise either already set value will be used or it will be empty
+PRODUCT=$(extract_product "$FILE")
+if [ -n "$PRODUCT" ]; then
+  FOUNDRY_PROFILE="$PRODUCT"
+fi
+SOLC_IN_PROFILE=$(forge config --json --root contracts | jq ".solc")
+SOLC_IN_PROFILE=$(echo "$SOLC_IN_PROFILE" | tr -d "'\"")
+echo "::debug::Detected Solidity version in profile: $SOLC_IN_PROFILE"
+
+set +e
+SOLCVER=$(extract_pragma "$FILE")
+
+if [[ $? -ne 0 ]]; then
+  >&2 echo "::error:: Failed to extract the Solidity version from $FILE."
+  return 1
+fi
+
+set -e
+
+SOLCVER=$(echo "$SOLCVER" | tr -d "'\"")
+
+if [[ "$SOLC_IN_PROFILE" != "null" && -n "$SOLCVER" ]]; then
+  set +e
+  COMPAT_SOLC_VERSION=$(npx semver "$SOLC_IN_PROFILE" -r "$SOLCVER")
+  exit_code=$?
+  set -e
+  if [[ $exit_code -eq 0 && -n "$COMPAT_SOLC_VERSION" ]]; then
+    echo "::debug::Version $SOLC_IN_PROFILE satisfies the constraint $SOLCVER"
+    SOLC_TO_USE="$SOLC_IN_PROFILE"
+  else
+    echo "::debug::Version $SOLC_IN_PROFILE does not satisfy the constraint $SOLCVER"
+    SOLC_TO_USE="$SOLCVER"
+  fi
+ elif [[ "$SOLC_IN_PROFILE" != "null" && -z "$SOLCVER" ]]; then
+    >&2 echo "::error::No version found in the Solidity file. Exiting"
+    return 1
+  elif [[ "$SOLC_IN_PROFILE" == "null" && -n "$SOLCVER" ]]; then
+    echo "::debug::Using the version from the file: $SOLCVER"
+    SOLC_TO_USE="$SOLCVER"
+  else
+    >&2 echo "::error::No version found in the profile or the Solidity file."
+    return 1
+fi
+
+echo "Will use $SOLC_TO_USE"
+SOLC_TO_USE=$(echo "$SOLC_TO_USE" | tr -d "'\"")
+SOLC_TO_USE="$(echo "$SOLC_TO_USE" | sed 's/[^0-9\.]//g')"
+
+INSTALLED_VERSIONS=$(solc-select versions)
+
+if echo "$INSTALLED_VERSIONS" | grep -q "$SOLC_TO_USE"; then
+  echo "::debug::Version $SOLCVER is already installed."
+  if echo "$INSTALLED_VERSIONS" | grep "$SOLC_TO_USE" | grep -q "current"; then
+    echo "::debug::Version $SOLCVER is already selected."
+  else
+    echo "::debug::Selecting $SOLC_TO_USE"
+    solc-select use "$SOLC_TO_USE"
+  fi
+else
+  echo "::debug::Version $SOLC_TO_USE is not installed."
+  solc-select install "$SOLC_TO_USE"
+  solc-select use "$SOLC_TO_USE"
+fi
diff --git a/contracts/scripts/lcov_prune b/contracts/scripts/lcov_prune
new file mode 100755
index 0000000000..0f16715cb2
--- /dev/null
+++ b/contracts/scripts/lcov_prune
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+if [ "$#" -ne 3 ]; then
+    >&2 echo "Usage: $0 <product_name> <input_coverage_file> <output_coverage_file>"
+    exit 1
+fi
+
+set -e
+
+product_name=$1
+input_coverage_file=$2
+output_coverage_file=$3
+
+# src/v0.8/ccip/libraries/Internal.sol
+# src/v0.8/ccip/libraries/RateLimiter.sol
+# src/v0.8/ccip/libraries/USDPriceWith18Decimals.sol
+# src/v0.8/ccip/libraries/MerkleMultiProof.sol
+# src/v0.8/ccip/libraries/Pool.sol
+# excluded because Foundry doesn't support coverage on library files
+
+# BurnWithFromMintTokenPool is excluded because Forge doesn't seem to
+# register coverage, even though it is 100% covered.
+exclusion_list_ccip=(
+  "src/v0.8/ccip/ocr/OCR2Abstract.sol"
+  "src/v0.8/ccip/libraries/Internal.sol"
+  "src/v0.8/ccip/libraries/RateLimiter.sol"
+  "src/v0.8/ccip/libraries/USDPriceWith18Decimals.sol"
+  "src/v0.8/ccip/libraries/MerkleMultiProof.sol"
+  "src/v0.8/ccip/libraries/Pool.sol"
+  "src/v0.8/ConfirmedOwnerWithProposal.sol"
+  "src/v0.8/tests/MockV3Aggregator.sol"
+  "src/v0.8/ccip/applications/CCIPClientExample.sol"
+  "src/v0.8/ccip/pools/BurnWithFromMintTokenPool.sol"
+)
+
+exclusion_list_shared=(
+   "*/shared/*"
+)
+
+exclusion_list_common=(
+  "*/$product_name/test/*"
+  "*/vendor/*"
+)
+
+all_exclusions=()
+
+case "$product_name" in
+  "ccip")
+    all_exclusions+=("${exclusion_list_ccip[@]}")
+    ;;
+  "shared")
+  # No product-specific exclusions for shared
+  ;;
+  *)
+  ;;
+esac
+
+all_exclusions+=("${exclusion_list_common[@]}")
+
+if [ "$product_name" != "shared" ]; then
+  all_exclusions+=("${exclusion_list_shared[@]}")
+fi
+
+echo "Excluding the following files for product $product_name:"
+for exclusion in "${all_exclusions[@]}"; do
+  echo "$exclusion"
+done
+
+lcov_command="lcov --remove $input_coverage_file -o $output_coverage_file"
+
+for exclusion in "${all_exclusions[@]}"; do
+  lcov_command+=" \"$exclusion\""
+done
+
+lcov_command+=" --rc lcov_branch_coverage=1"
+
+eval $lcov_command
diff --git a/contracts/scripts/native_solc_compile_all_ccip b/contracts/scripts/native_solc_compile_all_ccip
index a384ea6786..7b2c580b3c 100755
--- a/contracts/scripts/native_solc_compile_all_ccip
+++ b/contracts/scripts/native_solc_compile_all_ccip
@@ -67,7 +67,7 @@ compileContract ccip/onRamp/EVM2EVMOnRamp.sol
 compileContract ccip/CommitStore.sol
 compileContract ccip/MultiAggregateRateLimiter.sol
 compileContract ccip/Router.sol
-compileContract ccip/PriceRegistry.sol
+compileContract ccip/FeeQuoter.sol
 compileContract ccip/RMN.sol
 compileContract ccip/ARMProxy.sol
 compileContract ccip/tokenAdminRegistry/TokenAdminRegistry.sol
diff --git a/contracts/src/v0.8/ccip/PriceRegistry.sol b/contracts/src/v0.8/ccip/FeeQuoter.sol
similarity index 90%
rename from contracts/src/v0.8/ccip/PriceRegistry.sol
rename to contracts/src/v0.8/ccip/FeeQuoter.sol
index 8551971753..970485e90f 100644
--- a/contracts/src/v0.8/ccip/PriceRegistry.sol
+++ b/contracts/src/v0.8/ccip/FeeQuoter.sol
@@ -2,6 +2,7 @@
 pragma solidity 0.8.24;
 
 import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
+import {IFeeQuoter} from "./interfaces/IFeeQuoter.sol";
 import {IPriceRegistry} from "./interfaces/IPriceRegistry.sol";
 
 import {AuthorizedCallers} from "../shared/access/AuthorizedCallers.sol";
@@ -16,43 +17,18 @@ import {IReceiver} from "../keystone/interfaces/IReceiver.sol";
 import {KeystoneFeedDefaultMetadataLib} from "../keystone/lib/KeystoneFeedDefaultMetadataLib.sol";
 import {EnumerableSet} from "../vendor/openzeppelin-solidity/v5.0.2/contracts/utils/structs/EnumerableSet.sol";
 
-/// @notice The PriceRegistry contract responsibility is to store the current gas price in USD for a given destination chain,
-/// and the price of a token in USD allowing the owner or priceUpdater to update this value.
+/// @notice The FeeQuoter contract responsibility is to:
+///   - Store the current gas price in USD for a given destination chain,
+///   - Store the price of a token in USD allowing the owner or priceUpdater to update this value.
+///   - Manage chain specific fee calculations.
 /// The authorized callers in the contract represent the fee price updaters.
-contract PriceRegistry is
-  AuthorizedCallers,
-  IPriceRegistry,
-  ITypeAndVersion,
-  IReceiver,
-  KeystoneFeedsPermissionHandler
-{
+contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver, KeystoneFeedsPermissionHandler {
   using EnumerableSet for EnumerableSet.AddressSet;
   using USDPriceWith18Decimals for uint224;
   using KeystoneFeedDefaultMetadataLib for bytes;
 
-  /// @notice Token price data feed update
-  struct TokenPriceFeedUpdate {
-    address sourceToken; // Source token to update feed for
-    IPriceRegistry.TokenPriceFeedConfig feedConfig; // Feed config update data
-  }
-
-  /// @dev Struct that contains the static configuration
-  /// RMN depends on this struct, if changing, please notify the RMN maintainers.
-  // solhint-disable-next-line gas-struct-packing
-  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.
-  }
-
-  /// @notice The struct representing the received CCIP feed report from keystone IReceiver.onReport()
-  struct ReceivedCCIPFeedReport {
-    address token; // Token address
-    uint224 price; // ─────────╮ Price of the token in USD with 18 decimals
-    uint32 timestamp; // ──────╯ Timestamp of the price update
-  }
-
   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);
@@ -73,7 +49,7 @@ contract PriceRegistry is
   event FeeTokenRemoved(address indexed feeToken);
   event UsdPerUnitGasUpdated(uint64 indexed destChain, uint256 value, uint256 timestamp);
   event UsdPerTokenUpdated(address indexed token, uint256 value, uint256 timestamp);
-  event PriceFeedPerTokenUpdated(address indexed token, IPriceRegistry.TokenPriceFeedConfig priceFeedConfig);
+  event PriceFeedPerTokenUpdated(address indexed token, IFeeQuoter.TokenPriceFeedConfig priceFeedConfig);
   event TokenTransferFeeConfigUpdated(
     uint64 indexed destChainSelector, address indexed token, TokenTransferFeeConfig tokenTransferFeeConfig
   );
@@ -82,6 +58,28 @@ contract PriceRegistry is
   event DestChainConfigUpdated(uint64 indexed destChainSelector, DestChainConfig destChainConfig);
   event DestChainAdded(uint64 indexed destChainSelector, DestChainConfig destChainConfig);
 
+  /// @notice Token price data feed update
+  struct TokenPriceFeedUpdate {
+    address sourceToken; // Source token to update feed for
+    IFeeQuoter.TokenPriceFeedConfig feedConfig; // Feed config update data
+  }
+
+  /// @dev Struct that contains the static configuration
+  /// RMN depends on this struct, if changing, please notify the RMN maintainers.
+  // solhint-disable-next-line gas-struct-packing
+  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.
+  }
+
+  /// @notice The struct representing the received CCIP feed report from keystone IReceiver.onReport()
+  struct ReceivedCCIPFeedReport {
+    address token; // Token address
+    uint224 price; // ─────────╮ Price of the token in USD with 18 decimals
+    uint32 timestamp; // ──────╯ Timestamp of the price update
+  }
+
   /// @dev Struct to hold the fee & validation configs for a destination chain
   struct DestChainConfig {
     bool isEnabled; // ──────────────────────────╮ Whether this destination chain is enabled
@@ -96,10 +94,9 @@ contract PriceRegistry is
     // The following three properties are defaults, they can be overridden by setting the TokenTransferFeeConfig for a token
     uint16 defaultTokenFeeUSDCents; //           │ Default token fee charged per token transfer
     uint32 defaultTokenDestGasOverhead; // ──────╯ Default gas charged to execute the token transfer on the destination chain
-    uint32 defaultTokenDestBytesOverhead; // ────╮ Default extra data availability bytes charged per token transfer
-    uint32 defaultTxGasLimit; //                 │ Default gas limit for a tx
+    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 networkFeeUSDCents; //                │ Flat network fee to charge for messages, multiples of 0.01 USD
     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.
   }
@@ -128,7 +125,7 @@ contract PriceRegistry is
   /// that an array of these can be passed in the TokenTransferFeeConfigArgs struct to set the mapping
   struct TokenTransferFeeConfigSingleTokenArgs {
     address token; // Token address
-    TokenTransferFeeConfig tokenTransferFeeConfig; // struct to hold the transfer fee configuration for token transfers
+    TokenTransferFeeConfig tokenTransferFeeConfig; // Struct to hold the transfer fee configuration for token transfers
   }
 
   /// @dev Struct to hold the token transfer fee configurations for a destination chain and a set of tokens. Same as TokenTransferFeeConfigSingleTokenArgs
@@ -151,10 +148,10 @@ contract PriceRegistry is
   /// applyPremiumMultiplierWeiPerEthUpdates to set the mapping
   struct PremiumMultiplierWeiPerEthArgs {
     address token; // // ───────────────────╮ Token address
-    uint64 premiumMultiplierWeiPerEth; // ──╯ Multiplier for destination chain specific premiums. Should never be 0 so can be used as an isEnabled flag
+    uint64 premiumMultiplierWeiPerEth; // ──╯ Multiplier for destination chain specific premiums.
   }
 
-  string public constant override typeAndVersion = "PriceRegistry 1.6.0-dev";
+  string public constant override typeAndVersion = "FeeQuoter 1.6.0-dev";
 
   /// @dev The gas price per unit of gas for a given destination chain, in USD with 18 decimals.
   /// Multiple gas prices can be encoded into the same value. Each price takes {Internal.GAS_PRICE_BITS} bits.
@@ -175,10 +172,9 @@ contract PriceRegistry is
   mapping(address token => Internal.TimestampedPackedUint224 price) private s_usdPerToken;
 
   /// @dev Stores the price data feed configurations per token.
-  mapping(address token => IPriceRegistry.TokenPriceFeedConfig dataFeedAddress) private s_usdPriceFeedsPerToken;
+  mapping(address token => IFeeQuoter.TokenPriceFeedConfig dataFeedAddress) private s_usdPriceFeedsPerToken;
 
   /// @dev The multiplier for destination chain specific premiums that can be set by the owner or fee admin
-  /// This should never be 0 once set, so it can be used as an isEnabled flag
   mapping(address token => uint64 premiumMultiplierWeiPerEth) internal s_premiumMultiplierWeiPerEth;
 
   /// @dev The destination chain specific fee configs
@@ -193,9 +189,9 @@ contract PriceRegistry is
   /// @dev The link token address
   address internal immutable i_linkToken;
 
-  // Subset of tokens which prices tracked by this registry which are fee tokens.
+  /// @dev Subset of tokens which prices tracked by this registry which are fee tokens.
   EnumerableSet.AddressSet private s_feeTokens;
-  // The amount of time a gas price can be stale before it is considered invalid.
+  /// @dev The amount of time a gas price can be stale before it is considered invalid.
   uint32 private immutable i_stalenessThreshold;
 
   constructor(
@@ -231,7 +227,7 @@ contract PriceRegistry is
 
   /// @inheritdoc IPriceRegistry
   function getTokenPrice(address token) public view override returns (Internal.TimestampedPackedUint224 memory) {
-    IPriceRegistry.TokenPriceFeedConfig memory priceFeedConfig = s_usdPriceFeedsPerToken[token];
+    IFeeQuoter.TokenPriceFeedConfig memory priceFeedConfig = s_usdPriceFeedsPerToken[token];
     if (priceFeedConfig.dataFeedAddress == address(0)) {
       return s_usdPerToken[token];
     }
@@ -245,12 +241,9 @@ contract PriceRegistry is
   }
 
   /// @inheritdoc IPriceRegistry
-  function getTokenPrices(address[] calldata tokens)
-    external
-    view
-    override
-    returns (Internal.TimestampedPackedUint224[] memory)
-  {
+  function getTokenPrices(
+    address[] calldata tokens
+  ) external view override returns (Internal.TimestampedPackedUint224[] memory) {
     uint256 length = tokens.length;
     Internal.TimestampedPackedUint224[] memory tokenPrices = new Internal.TimestampedPackedUint224[](length);
     for (uint256 i = 0; i < length; ++i) {
@@ -259,23 +252,17 @@ contract PriceRegistry is
     return tokenPrices;
   }
 
-  /// @inheritdoc IPriceRegistry
-  function getTokenPriceFeedConfig(address token)
-    external
-    view
-    override
-    returns (IPriceRegistry.TokenPriceFeedConfig memory)
-  {
+  /// @inheritdoc IFeeQuoter
+  function getTokenPriceFeedConfig(
+    address token
+  ) external view override returns (IFeeQuoter.TokenPriceFeedConfig memory) {
     return s_usdPriceFeedsPerToken[token];
   }
 
   /// @inheritdoc IPriceRegistry
-  function getDestinationChainGasPrice(uint64 destChainSelector)
-    external
-    view
-    override
-    returns (Internal.TimestampedPackedUint224 memory)
-  {
+  function getDestinationChainGasPrice(
+    uint64 destChainSelector
+  ) external view override returns (Internal.TimestampedPackedUint224 memory) {
     return s_usdPerUnitGasByDestChainSelector[destChainSelector];
   }
 
@@ -310,9 +297,9 @@ contract PriceRegistry is
     return (fromTokenAmount * _getValidatedTokenPrice(fromToken)) / _getValidatedTokenPrice(toToken);
   }
 
-  /// @notice Gets the token price for a given token and revert if the token is not supported
+  /// @notice Gets the token price for a given token and reverts if the token is not supported
   /// @param token The address of the token to get the price for
-  /// @return the token price
+  /// @return tokenPriceValue The token price
   function _getValidatedTokenPrice(address token) internal view returns (uint224) {
     Internal.TimestampedPackedUint224 memory tokenPrice = getTokenPrice(token);
     // Token price must be set at least once
@@ -323,11 +310,9 @@ contract PriceRegistry is
   /// @notice Gets the token price from a data feed address, rebased to the same units as s_usdPerToken
   /// @param priceFeedConfig token data feed configuration with valid data feed address (used to retrieve price & timestamp)
   /// @return tokenPrice data feed price answer rebased to s_usdPerToken units, with latest block timestamp
-  function _getTokenPriceFromDataFeed(IPriceRegistry.TokenPriceFeedConfig memory priceFeedConfig)
-    internal
-    view
-    returns (Internal.TimestampedPackedUint224 memory tokenPrice)
-  {
+  function _getTokenPriceFromDataFeed(
+    IFeeQuoter.TokenPriceFeedConfig memory priceFeedConfig
+  ) internal view returns (Internal.TimestampedPackedUint224 memory tokenPrice) {
     AggregatorV3Interface dataFeedContract = AggregatorV3Interface(priceFeedConfig.dataFeedAddress);
     (
       /* uint80 roundID */
@@ -346,7 +331,7 @@ contract PriceRegistry is
     uint224 rebasedValue =
       _calculateRebasedValue(dataFeedContract.decimals(), priceFeedConfig.tokenDecimals, uint256(dataFeedAnswer));
 
-    // Data feed staleness is unchecked to decouple the PriceRegistry from data feed delay issues
+    // Data feed staleness is unchecked to decouple the FeeQuoter from data feed delay issues
     return Internal.TimestampedPackedUint224({value: rebasedValue, timestamp: uint32(block.timestamp)});
   }
 
@@ -360,9 +345,9 @@ contract PriceRegistry is
   }
 
   /// @notice Add and remove tokens from feeTokens set.
+  /// @param feeTokensToRemove The addresses of the tokens which are no longer considered feeTokens.
   /// @param feeTokensToAdd The addresses of the tokens which are now considered fee tokens
   /// and can be used to calculate fees.
-  /// @param feeTokensToRemove The addresses of the tokens which are no longer considered feeTokens.
   function applyFeeTokensUpdates(
     address[] memory feeTokensToAdd,
     address[] memory feeTokensToRemove
@@ -371,9 +356,9 @@ contract PriceRegistry is
   }
 
   /// @notice Add and remove tokens from feeTokens set.
+  /// @param feeTokensToRemove The addresses of the tokens which are no longer considered feeTokens.
   /// @param feeTokensToAdd The addresses of the tokens which are now considered fee tokens
   /// and can be used to calculate fees.
-  /// @param feeTokensToRemove The addresses of the tokens which are no longer considered feeTokens.
   function _applyFeeTokensUpdates(address[] memory feeTokensToAdd, address[] memory feeTokensToRemove) private {
     for (uint256 i = 0; i < feeTokensToAdd.length; ++i) {
       if (s_feeTokens.add(feeTokensToAdd[i])) {
@@ -427,7 +412,7 @@ contract PriceRegistry is
     for (uint256 i; i < tokenPriceFeedUpdates.length; ++i) {
       TokenPriceFeedUpdate memory update = tokenPriceFeedUpdates[i];
       address sourceToken = update.sourceToken;
-      IPriceRegistry.TokenPriceFeedConfig memory tokenPriceFeedConfig = update.feedConfig;
+      IFeeQuoter.TokenPriceFeedConfig memory tokenPriceFeedConfig = update.feedConfig;
 
       s_usdPriceFeedsPerToken[sourceToken] = tokenPriceFeedConfig;
       emit PriceFeedPerTokenUpdated(sourceToken, tokenPriceFeedConfig);
@@ -469,7 +454,7 @@ contract PriceRegistry is
   // │                       Fee quoting                            │
   // ================================================================
 
-  /// @inheritdoc IPriceRegistry
+  /// @inheritdoc IFeeQuoter
   /// @dev The function should always validate message.extraArgs, message.receiver and family-specific configs
   function getValidatedFee(
     uint64 destChainSelector,
@@ -477,6 +462,7 @@ contract PriceRegistry is
   ) external view returns (uint256 feeTokenAmount) {
     DestChainConfig memory destChainConfig = s_destChainConfigs[destChainSelector];
     if (!destChainConfig.isEnabled) revert DestinationChainNotEnabled(destChainSelector);
+    if (!s_feeTokens.contains(message.feeToken)) revert FeeTokenNotSupported(message.feeToken);
 
     uint256 numberOfTokens = message.tokenAmounts.length;
     _validateMessage(destChainConfig, message.data.length, numberOfTokens, message.receiver);
@@ -538,7 +524,7 @@ contract PriceRegistry is
     return ((premiumFee * premiumMultiplierWeiPerEth) + executionCost + dataAvailabilityCost) / feeTokenPrice;
   }
 
-  /// @notice Sets the fee configuration for a token
+  /// @notice Sets the fee configuration for a token.
   /// @param premiumMultiplierWeiPerEthArgs Array of PremiumMultiplierWeiPerEthArgs structs.
   function applyPremiumMultiplierWeiPerEthUpdates(
     PremiumMultiplierWeiPerEthArgs[] memory premiumMultiplierWeiPerEthArgs
@@ -599,13 +585,13 @@ contract PriceRegistry is
       if (!transferFeeConfig.isEnabled) {
         tokenTransferFeeUSDWei += uint256(destChainConfig.defaultTokenFeeUSDCents) * 1e16;
         tokenTransferGas += destChainConfig.defaultTokenDestGasOverhead;
-        tokenTransferBytesOverhead += destChainConfig.defaultTokenDestBytesOverhead;
+        tokenTransferBytesOverhead += Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES;
         continue;
       }
 
       uint256 bpsFeeUSDWei = 0;
       // Only calculate bps fee if ratio is greater than 0. Ratio of 0 means no bps fee for a token.
-      // Useful for when the PriceRegistry cannot return a valid price for the token.
+      // Useful for when the FeeQuoter cannot return a valid price for the token.
       if (transferFeeConfig.deciBps > 0) {
         uint224 tokenPrice = 0;
         if (tokenAmount.token != feeToken) {
@@ -708,6 +694,7 @@ contract PriceRegistry is
   /// @notice Gets the transfer fee config for a given token.
   /// @param destChainSelector The destination chain selector.
   /// @param token The token address.
+  /// @return tokenTransferFeeConfig The transfer fee config for the token.
   function getTokenTransferFeeConfig(
     uint64 destChainSelector,
     address token
@@ -762,19 +749,19 @@ contract PriceRegistry is
   // ================================================================
 
   /// @notice Validates that the destAddress matches the expected format of the family.
-  /// @param chainFamilySelector Tag to identify the target family
-  /// @param destAddress Dest address to validate
-  /// @dev precondition - assumes the family tag is correct and validated
+  /// @param chainFamilySelector Tag to identify the target family.
+  /// @param destAddress Dest address to validate.
+  /// @dev precondition - assumes the family tag is correct and validated.
   function _validateDestFamilyAddress(bytes4 chainFamilySelector, bytes memory destAddress) internal pure {
     if (chainFamilySelector == Internal.CHAIN_FAMILY_SELECTOR_EVM) {
       Internal._validateEVMAddress(destAddress);
     }
   }
 
-  /// @dev Convert the extra args bytes into a struct with validations against the dest chain config
-  /// @param extraArgs The extra args bytes
-  /// @param destChainConfig Dest chain config to validate against
-  /// @return EVMExtraArgs the extra args struct (latest version)
+  /// @dev Convert the extra args bytes into a struct with validations against the dest chain config.
+  /// @param extraArgs The extra args bytes.
+  /// @param destChainConfig Dest chain config to validate against.
+  /// @return evmExtraArgs The EVMExtraArgs struct (latest version).
   function _parseEVMExtraArgsFromBytes(
     bytes calldata extraArgs,
     DestChainConfig memory destChainConfig
@@ -790,9 +777,9 @@ contract PriceRegistry is
     return evmExtraArgs;
   }
 
-  /// @dev Convert the extra args bytes into a struct
-  /// @param extraArgs The extra args bytes
-  /// @param defaultTxGasLimit default tx gas limit to use in the absence of extra args
+  /// @dev Convert the extra args bytes into a struct.
+  /// @param extraArgs The extra args bytes.
+  /// @param defaultTxGasLimit default tx gas limit to use in the absence of extra args.
   /// @return EVMExtraArgs the extra args struct (latest version)
   function _parseUnvalidatedEVMExtraArgsFromBytes(
     bytes calldata extraArgs,
@@ -818,11 +805,11 @@ contract PriceRegistry is
   }
 
   /// @notice Validate the forwarded message to ensure it matches the configuration limits (message length, number of tokens)
-  /// and family-specific expectations (address format)
-  /// @param destChainConfig Dest chain config
+  /// and family-specific expectations (address format).
+  /// @param destChainConfig The destination chain config.
   /// @param dataLength The length of the data field of the message.
   /// @param numberOfTokens The number of tokens to be sent.
-  /// @param receiver Message receiver on the dest chain
+  /// @param receiver Message receiver on the dest chain.
   function _validateMessage(
     DestChainConfig memory destChainConfig,
     uint256 dataLength,
@@ -837,7 +824,7 @@ contract PriceRegistry is
     _validateDestFamilyAddress(destChainConfig.chainFamilySelector, receiver);
   }
 
-  /// @inheritdoc IPriceRegistry
+  /// @inheritdoc IFeeQuoter
   function processMessageArgs(
     uint64 destChainSelector,
     address feeToken,
@@ -862,15 +849,15 @@ contract PriceRegistry is
     return (msgFeeJuels, isOutOfOrderExecution, Client._argsToBytes(parsedExtraArgs));
   }
 
-  /// @inheritdoc IPriceRegistry
+  /// @inheritdoc IFeeQuoter
   /// @dev precondition - rampTokenAmounts and sourceTokenAmounts lengths must be equal
-  function validatePoolReturnData(
+  function processPoolReturnData(
     uint64 destChainSelector,
     Internal.RampTokenAmount[] calldata rampTokenAmounts,
     Client.EVMTokenAmount[] calldata sourceTokenAmounts
-  ) external view {
+  ) external view returns (bytes[] memory destExecDataPerToken) {
     bytes4 chainFamilySelector = s_destChainConfigs[destChainSelector].chainFamilySelector;
-
+    destExecDataPerToken = new bytes[](rampTokenAmounts.length);
     for (uint256 i = 0; i < rampTokenAmounts.length; ++i) {
       address sourceToken = sourceTokenAmounts[i].token;
 
@@ -885,16 +872,27 @@ contract PriceRegistry is
       }
 
       _validateDestFamilyAddress(chainFamilySelector, rampTokenAmounts[i].destTokenAddress);
+      FeeQuoter.TokenTransferFeeConfig memory tokenTransferFeeConfig =
+        s_tokenTransferFeeConfig[destChainSelector][sourceToken];
+      uint32 defaultGasOverhead = s_destChainConfigs[destChainSelector].defaultTokenDestGasOverhead;
+      // NOTE: Revisit this when adding new non-EVM chain family selector support
+      uint32 destGasAmount =
+        tokenTransferFeeConfig.isEnabled ? tokenTransferFeeConfig.destGasOverhead : defaultGasOverhead;
+
+      // The user will be billed either the default or the override, so we send the exact amount that we billed for
+      // to the destination chain to be used for the token releaseOrMint and transfer.
+      destExecDataPerToken[i] = abi.encode(destGasAmount);
     }
+    return destExecDataPerToken;
   }
 
   // ================================================================
   // │                           Configs                            │
   // ================================================================
 
-  /// @notice Returns the configured config for the dest chain selector
-  /// @param destChainSelector destination chain selector to fetch config for
-  /// @return destChainConfig config for the dest chain
+  /// @notice Returns the configured config for the dest chain selector.
+  /// @param destChainSelector Destination chain selector to fetch config for.
+  /// @return destChainConfig Config for the destination chain.
   function getDestChainConfig(uint64 destChainSelector) external view returns (DestChainConfig memory) {
     return s_destChainConfigs[destChainSelector];
   }
@@ -916,7 +914,6 @@ contract PriceRegistry is
       if (
         destChainSelector == 0 || destChainConfig.defaultTxGasLimit == 0
           || destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_EVM
-          || destChainConfig.defaultTokenDestBytesOverhead < Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES
           || destChainConfig.defaultTxGasLimit > destChainConfig.maxPerMsgGasLimit
       ) {
         revert InvalidDestChainConfig(destChainSelector);
@@ -933,9 +930,9 @@ contract PriceRegistry is
     }
   }
 
-  /// @notice Returns the static PriceRegistry config.
-  /// @dev RMN depends on this function, if changing, please notify the RMN maintainers.
-  /// @return the configuration.
+  /// @notice Returns the static FeeQuoter config.
+  /// @dev RMN depends on this function, if updated, please notify the RMN maintainers.
+  /// @return staticConfig The static configuration.
   function getStaticConfig() external view returns (StaticConfig memory) {
     return StaticConfig({
       maxFeeJuelsPerMsg: i_maxFeeJuelsPerMsg,
diff --git a/contracts/src/v0.8/ccip/MultiAggregateRateLimiter.sol b/contracts/src/v0.8/ccip/MultiAggregateRateLimiter.sol
index 33dee29b12..1fbfd22d1c 100644
--- a/contracts/src/v0.8/ccip/MultiAggregateRateLimiter.sol
+++ b/contracts/src/v0.8/ccip/MultiAggregateRateLimiter.sol
@@ -2,8 +2,8 @@
 pragma solidity 0.8.24;
 
 import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
+import {IFeeQuoter} from "./interfaces/IFeeQuoter.sol";
 import {IMessageInterceptor} from "./interfaces/IMessageInterceptor.sol";
-import {IPriceRegistry} from "./interfaces/IPriceRegistry.sol";
 
 import {AuthorizedCallers} from "../shared/access/AuthorizedCallers.sol";
 import {EnumerableMapAddresses} from "./../shared/enumerable/EnumerableMapAddresses.sol";
@@ -13,7 +13,7 @@ import {USDPriceWith18Decimals} from "./libraries/USDPriceWith18Decimals.sol";
 
 /// @notice The aggregate rate limiter is a wrapper of the token bucket rate limiter
 /// which permits rate limiting based on the aggregate value of a group of
-/// token transfers, using a price registry to convert to a numeraire asset (e.g. USD).
+/// token transfers, using a fee quoter to convert to a numeraire asset (e.g. USD).
 /// The contract is a standalone multi-lane message validator contract, which can be called by authorized
 /// ramp contracts to apply rate limit changes to lanes, and revert when the rate limits get breached.
 contract MultiAggregateRateLimiter is IMessageInterceptor, AuthorizedCallers, ITypeAndVersion {
@@ -25,31 +25,31 @@ contract MultiAggregateRateLimiter is IMessageInterceptor, AuthorizedCallers, IT
   error ZeroChainSelectorNotAllowed();
 
   event RateLimiterConfigUpdated(uint64 indexed remoteChainSelector, bool isOutboundLane, RateLimiter.Config config);
-  event PriceRegistrySet(address newPriceRegistry);
+  event FeeQuoterSet(address newFeeQuoter);
   event TokenAggregateRateLimitAdded(uint64 remoteChainSelector, bytes remoteToken, address localToken);
   event TokenAggregateRateLimitRemoved(uint64 remoteChainSelector, address localToken);
 
-  /// @notice RemoteRateLimitToken struct containing the local token address with the chain selector
-  /// The struct is used for removals and updates, since the local -> remote token mappings are scoped per-chain
+  /// @notice LocalRateLimitToken struct containing the local token address with the remote chain selector.
+  /// The struct is used for removals and updates, since the local -> remote token mappings are scoped per-chain.
   struct LocalRateLimitToken {
     uint64 remoteChainSelector; // ────╮ Remote chain selector for which to update the rate limit token mapping
     address localToken; // ────────────╯ Token on the chain on which the multi-ARL is deployed
   }
 
-  /// @notice RateLimitToken struct containing both the local and remote token addresses
+  /// @notice RateLimitTokenArgs struct containing both the local and remote token addresses.
   struct RateLimitTokenArgs {
     LocalRateLimitToken localTokenArgs; // Local token update args scoped to one remote chain
     bytes remoteToken; // Token on the remote chain (for OnRamp - dest, of OffRamp - source)
   }
 
-  /// @notice Update args for a single rate limiter config update
+  /// @notice Update args for a single rate limiter config update.
   struct RateLimiterConfigArgs {
-    uint64 remoteChainSelector; // ────╮ Chain selector to set config for
+    uint64 remoteChainSelector; // ────╮ Remote chain selector to set config for
     bool isOutboundLane; // ───────────╯ If set to true, represents the outbound message lane (OnRamp), and the inbound message lane otherwise (OffRamp)
     RateLimiter.Config rateLimiterConfig; // Rate limiter config to set
   }
 
-  /// @notice Struct to store rate limit token buckets for both lane directions
+  /// @notice Struct to store rate limit token buckets for both lane directions.
   struct RateLimiterBuckets {
     RateLimiter.TokenBucket inboundLaneBucket; // Bucket for the inbound lane (remote -> local)
     RateLimiter.TokenBucket outboundLaneBucket; // Bucket for the outbound lane (local -> remote)
@@ -62,16 +62,16 @@ contract MultiAggregateRateLimiter is IMessageInterceptor, AuthorizedCallers, IT
   mapping(uint64 remoteChainSelector => EnumerableMapAddresses.AddressToBytesMap tokensLocalToRemote) internal
     s_rateLimitedTokensLocalToRemote;
 
-  /// @notice The address of the PriceRegistry used to query token values for ratelimiting
-  address internal s_priceRegistry;
+  /// @notice The address of the FeeQuoter used to query token values for ratelimiting.
+  address internal s_feeQuoter;
 
   /// @notice Rate limiter token bucket states per chain, with separate buckets for inbound and outbound lanes.
   mapping(uint64 remoteChainSelector => RateLimiterBuckets buckets) internal s_rateLimitersByChainSelector;
 
-  /// @param priceRegistry the price registry to set
-  /// @param authorizedCallers the authorized callers to set
-  constructor(address priceRegistry, address[] memory authorizedCallers) AuthorizedCallers(authorizedCallers) {
-    _setPriceRegistry(priceRegistry);
+  /// @param feeQuoter the fee quoter to set.
+  /// @param authorizedCallers the authorized callers to set.
+  constructor(address feeQuoter, address[] memory authorizedCallers) AuthorizedCallers(authorizedCallers) {
+    _setFeeQuoter(feeQuoter);
   }
 
   /// @inheritdoc IMessageInterceptor
@@ -87,9 +87,9 @@ contract MultiAggregateRateLimiter is IMessageInterceptor, AuthorizedCallers, IT
     _applyRateLimit(destChainSelector, message.tokenAmounts, true);
   }
 
-  /// @notice Applies the rate limit to the token bucket if enabled
-  /// @param remoteChainSelector The remote chain selector
-  /// @param tokenAmounts The tokens and amounts to rate limit
+  /// @notice Applies the rate limit to the token bucket if enabled.
+  /// @param remoteChainSelector The remote chain selector.
+  /// @param tokenAmounts The tokens and amounts to rate limit.
   /// @param isOutgoingLane if set to true, fetches the bucket for the outgoing message lane (OnRamp).
   function _applyRateLimit(
     uint64 remoteChainSelector,
@@ -111,10 +111,10 @@ contract MultiAggregateRateLimiter is IMessageInterceptor, AuthorizedCallers, IT
     }
   }
 
-  /// @param remoteChainSelector chain selector to retrieve token bucket for
+  /// @param remoteChainSelector chain selector to retrieve token bucket for.
   /// @param isOutboundLane if set to true, fetches the bucket for the outbound message lane (OnRamp).
   /// Otherwise fetches for the inbound message lane (OffRamp).
-  /// @return bucket Storage pointer to the token bucket representing a specific lane
+  /// @return bucket Storage pointer to the token bucket representing a specific lane.
   function _getTokenBucket(
     uint64 remoteChainSelector,
     bool isOutboundLane
@@ -127,12 +127,13 @@ contract MultiAggregateRateLimiter is IMessageInterceptor, AuthorizedCallers, IT
     }
   }
 
-  /// @notice Retrieves the token value for a token using the PriceRegistry
-  /// @return tokenValue USD value in 18 decimals
+  /// @notice Retrieves the token value for a token using the FeeQuoter.
+  /// @param tokenAmount The token and amount to get the value for.
+  /// @return tokenValue USD value in 18 decimals.
   function _getTokenValue(Client.EVMTokenAmount memory tokenAmount) internal view returns (uint256) {
     // not fetching validated price, as price staleness is not important for value-based rate limiting
     // we only need to verify the price is not 0
-    uint224 pricePerToken = IPriceRegistry(s_priceRegistry).getTokenPrice(tokenAmount.token).value;
+    uint224 pricePerToken = IFeeQuoter(s_feeQuoter).getTokenPrice(tokenAmount.token).value;
     if (pricePerToken == 0) revert PriceNotFoundForToken(tokenAmount.token);
     return pricePerToken._calcUSDValueFromTokenAmount(tokenAmount.amount);
   }
@@ -142,7 +143,7 @@ contract MultiAggregateRateLimiter is IMessageInterceptor, AuthorizedCallers, IT
   /// @param isOutboundLane if set to true, fetches the rate limit state for the outbound message lane (OnRamp).
   /// Otherwise fetches for the inbound message lane (OffRamp).
   /// The outbound and inbound message rate limit state is completely separated.
-  /// @return The token bucket.
+  /// @return tokenBucket The token bucket.
   function currentRateLimiterState(
     uint64 remoteChainSelector,
     bool isOutboundLane
@@ -151,8 +152,8 @@ contract MultiAggregateRateLimiter is IMessageInterceptor, AuthorizedCallers, IT
   }
 
   /// @notice Applies the provided rate limiter config updates.
-  /// @param rateLimiterUpdates Rate limiter updates
-  /// @dev should only be callable by the owner
+  /// @param rateLimiterUpdates Rate limiter updates.
+  /// @dev Only callable by the owner.
   function applyRateLimiterConfigUpdates(RateLimiterConfigArgs[] memory rateLimiterUpdates) external onlyOwner {
     for (uint256 i = 0; i < rateLimiterUpdates.length; ++i) {
       RateLimiterConfigArgs memory updateArgs = rateLimiterUpdates[i];
@@ -189,17 +190,15 @@ contract MultiAggregateRateLimiter is IMessageInterceptor, AuthorizedCallers, IT
     }
   }
 
-  /// @notice Get all tokens which are included in Aggregate Rate Limiting.
-  /// @param remoteChainSelector chain selector to get rate limit tokens for
-  /// @return localTokens The local chain representation of the tokens that are rate limited.
-  /// @return remoteTokens The remote representation of the tokens that are rate limited.
+  /// @notice Gets all tokens which are included in Aggregate Rate Limiting.
   /// @dev the order of IDs in the list is **not guaranteed**, therefore, if ordering matters when
   /// making successive calls, one should keep the block height constant to ensure a consistent result.
-  function getAllRateLimitTokens(uint64 remoteChainSelector)
-    external
-    view
-    returns (address[] memory localTokens, bytes[] memory remoteTokens)
-  {
+  /// @param remoteChainSelector chain selector to get rate limit tokens for.
+  /// @return localTokens The local chain representation of the tokens that are rate limited.
+  /// @return remoteTokens The remote representation of the tokens that are rate limited.
+  function getAllRateLimitTokens(
+    uint64 remoteChainSelector
+  ) external view returns (address[] memory localTokens, bytes[] memory remoteTokens) {
     uint256 tokenCount = s_rateLimitedTokensLocalToRemote[remoteChainSelector].length();
 
     localTokens = new address[](tokenCount);
@@ -246,27 +245,27 @@ contract MultiAggregateRateLimiter is IMessageInterceptor, AuthorizedCallers, IT
     }
   }
 
-  /// @return priceRegistry The configured PriceRegistry address
-  function getPriceRegistry() external view returns (address) {
-    return s_priceRegistry;
+  /// @return feeQuoter The configured FeeQuoter address.
+  function getFeeQuoter() external view returns (address feeQuoter) {
+    return s_feeQuoter;
   }
 
-  /// @notice Sets the Price Registry address
-  /// @param newPriceRegistry the address of the new PriceRegistry
-  /// @dev precondition The address must be a non-zero address
-  function setPriceRegistry(address newPriceRegistry) external onlyOwner {
-    _setPriceRegistry(newPriceRegistry);
+  /// @notice Sets the FeeQuoter address.
+  /// @param newFeeQuoter the address of the new FeeQuoter.
+  /// @dev precondition The address must be a non-zero address.
+  function setFeeQuoter(address newFeeQuoter) external onlyOwner {
+    _setFeeQuoter(newFeeQuoter);
   }
 
-  /// @notice Sets the Price Registry address
-  /// @param newPriceRegistry the address of the new PriceRegistry
-  /// @dev precondition The address must be a non-zero address
-  function _setPriceRegistry(address newPriceRegistry) internal {
-    if (newPriceRegistry == address(0)) {
+  /// @notice Sets the FeeQuoter address.
+  /// @param newFeeQuoter the address of the new FeeQuoter.
+  /// @dev precondition The address must be a non-zero address.
+  function _setFeeQuoter(address newFeeQuoter) internal {
+    if (newFeeQuoter == address(0)) {
       revert ZeroAddressNotAllowed();
     }
 
-    s_priceRegistry = newPriceRegistry;
-    emit PriceRegistrySet(newPriceRegistry);
+    s_feeQuoter = newFeeQuoter;
+    emit FeeQuoterSet(newFeeQuoter);
   }
 }
diff --git a/contracts/src/v0.8/ccip/NonceManager.sol b/contracts/src/v0.8/ccip/NonceManager.sol
index de9b9ce4a3..38212e1d5f 100644
--- a/contracts/src/v0.8/ccip/NonceManager.sol
+++ b/contracts/src/v0.8/ccip/NonceManager.sol
@@ -30,7 +30,7 @@ contract NonceManager is INonceManager, AuthorizedCallers, ITypeAndVersion {
 
   string public constant override typeAndVersion = "NonceManager 1.6.0-dev";
 
-  /// @dev previous ramps
+  /// @dev The previous on/off ramps per chain selector
   mapping(uint64 chainSelector => PreviousRamps previousRamps) private s_previousRamps;
   /// @dev The current outbound nonce per sender used on the onramp
   mapping(uint64 destChainSelector => mapping(address sender => uint64 outboundNonce)) private s_outboundNonces;
@@ -52,10 +52,10 @@ contract NonceManager is INonceManager, AuthorizedCallers, ITypeAndVersion {
     return outboundNonce;
   }
 
-  /// @notice Returns the outbound nonce for a given sender on a given destination chain
-  /// @param destChainSelector The destination chain selector
-  /// @param sender The sender address
-  /// @return The outbound nonce
+  /// @notice Returns the outbound nonce for a given sender on a given destination chain.
+  /// @param destChainSelector The destination chain selector.
+  /// @param sender The sender address.
+  /// @return outboundNonce The outbound nonce.
   function getOutboundNonce(uint64 destChainSelector, address sender) external view returns (uint64) {
     return _getOutboundNonce(destChainSelector, sender);
   }
@@ -95,10 +95,10 @@ contract NonceManager is INonceManager, AuthorizedCallers, ITypeAndVersion {
     return true;
   }
 
-  /// @notice Returns the inbound nonce for a given sender on a given source chain
-  /// @param sourceChainSelector The source chain selector
-  /// @param sender The encoded sender address
-  /// @return The inbound nonce
+  /// @notice Returns the inbound nonce for a given sender on a given source chain.
+  /// @param sourceChainSelector The source chain selector.
+  /// @param sender The encoded sender address.
+  /// @return inboundNonce The inbound nonce.
   function getInboundNonce(uint64 sourceChainSelector, bytes calldata sender) external view returns (uint64) {
     return _getInboundNonce(sourceChainSelector, sender);
   }
@@ -121,8 +121,8 @@ contract NonceManager is INonceManager, AuthorizedCallers, ITypeAndVersion {
     return inboundNonce;
   }
 
-  /// @notice Updates the previous ramps addresses
-  /// @param previousRampsArgs The previous on/off ramps addresses
+  /// @notice Updates the previous ramps addresses.
+  /// @param previousRampsArgs The previous on/off ramps addresses.
   function applyPreviousRampsUpdates(PreviousRampsArgs[] calldata previousRampsArgs) external onlyOwner {
     for (uint256 i = 0; i < previousRampsArgs.length; ++i) {
       PreviousRampsArgs calldata previousRampsArg = previousRampsArgs[i];
@@ -143,7 +143,7 @@ contract NonceManager is INonceManager, AuthorizedCallers, ITypeAndVersion {
 
   /// @notice Gets the previous onRamp address for the given chain selector
   /// @param chainSelector The chain selector
-  /// @return The previous onRamp address
+  /// @return previousRamps The previous on/offRamp addresses
   function getPreviousRamps(uint64 chainSelector) external view returns (PreviousRamps memory) {
     return s_previousRamps[chainSelector];
   }
diff --git a/contracts/src/v0.8/ccip/RMN.sol b/contracts/src/v0.8/ccip/RMN.sol
index ef672bb7ab..3b9af7e0ce 100644
--- a/contracts/src/v0.8/ccip/RMN.sol
+++ b/contracts/src/v0.8/ccip/RMN.sol
@@ -13,7 +13,7 @@ import {EnumerableSet} from "../vendor/openzeppelin-solidity/v5.0.2/contracts/ut
 // deployed, relying on isCursed().
 bytes16 constant LEGACY_CURSE_SUBJECT = 0x01000000000000000000000000000000;
 
-// An active curse on this subject will cause isCursed() and isCursed(bytes32) to return true. Use this subject for
+// An active curse on this subject will cause isCursed() and isCursed(bytes16) to return true. Use this subject for
 // issues affecting all of CCIP chains, or pertaining to the chain that this contract is deployed on, instead of using
 // the local chain selector as a subject.
 bytes16 constant GLOBAL_CURSE_SUBJECT = 0x01000000000000000000000000000001;
@@ -732,11 +732,9 @@ contract RMN is IRMN, OwnerIsCreator, ITypeAndVersion {
   /// @return accumulatedWeight sum of weights of voters, will be zero if voting took place with an older config version
   /// @return blessed will be accurate regardless of when voting took place
   /// @dev This is a helper method for offchain code so efficiency is not really a concern.
-  function getBlessProgress(IRMN.TaggedRoot calldata taggedRoot)
-    external
-    view
-    returns (address[] memory blessVoteAddrs, uint16 accumulatedWeight, bool blessed)
-  {
+  function getBlessProgress(
+    IRMN.TaggedRoot calldata taggedRoot
+  ) external view returns (address[] memory blessVoteAddrs, uint16 accumulatedWeight, bool blessed) {
     bytes32 taggedRootHash = _taggedRootHash(taggedRoot);
     BlessVoteProgress memory progress = s_blessVoteProgressByTaggedRootHash[taggedRootHash];
     blessed = progress.weightThresholdMet;
@@ -762,7 +760,9 @@ contract RMN is IRMN, OwnerIsCreator, ITypeAndVersion {
   /// @return cursed might be true even if the owner has no active vote and accumulatedWeight < curseWeightThreshold,
   /// due to a retained curse from a prior config
   /// @dev This is a helper method for offchain code so efficiency is not really a concern.
-  function getCurseProgress(bytes16 subject)
+  function getCurseProgress(
+    bytes16 subject
+  )
     external
     view
     returns (address[] memory curseVoteAddrs, bytes28[] memory cursesHashes, uint16 accumulatedWeight, bool cursed)
diff --git a/contracts/src/v0.8/ccip/RMNHome.sol b/contracts/src/v0.8/ccip/RMNHome.sol
new file mode 100644
index 0000000000..f28a5da95b
--- /dev/null
+++ b/contracts/src/v0.8/ccip/RMNHome.sol
@@ -0,0 +1,164 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.24;
+
+import "@openzeppelin/contracts/access/Ownable2Step.sol";
+
+import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
+
+/// @notice Stores the home configuration for RMN, that is referenced by CCIP oracles, RMN nodes, and the RMNRemote
+/// contracts.
+contract RMNHome is Ownable2Step, ITypeAndVersion {
+  /// @dev temp placeholder to exclude this contract from coverage
+  function test() public {}
+
+  string public constant override typeAndVersion = "RMNHome 1.6.0-dev";
+  uint256 public constant CONFIG_RING_BUFFER_SIZE = 2;
+
+  struct Node {
+    string peerId; // used for p2p communication, base58 encoded
+    bytes32 offchainPublicKey; // observations are signed with this public key, and are only verified offchain
+  }
+
+  struct SourceChain {
+    uint64 chainSelector;
+    uint64[] observerNodeIndices; // indices into Config.nodes, strictly increasing
+    uint64 minObservers; // required to agree on an observation for this source chain
+  }
+
+  struct Config {
+    // No sorting requirement for nodes, but ensure that SourceChain.observerNodeIndices in the home chain config &
+    // Signer.nodeIndex in the remote chain configs are appropriately updated when changing this field
+    Node[] nodes;
+    // Should be in ascending order of chainSelector
+    SourceChain[] sourceChains;
+  }
+
+  struct VersionedConfig {
+    uint32 version;
+    Config config;
+  }
+
+  function _configDigest(VersionedConfig memory versionedConfig) internal pure returns (bytes32) {
+    uint256 h = uint256(keccak256(abi.encode(versionedConfig)));
+    uint256 prefixMask = type(uint256).max << (256 - 16); // 0xFFFF00..00
+    uint256 prefix = 0x000b << (256 - 16); // 0x000b00..00
+    return bytes32((prefix & prefixMask) | (h & ~prefixMask));
+  }
+
+  // if we were to have VersionedConfig instead of Config in the ring buffer, we couldn't assign directly to it in
+  // setConfig without via-ir
+  uint32[CONFIG_RING_BUFFER_SIZE] s_configCounts; // s_configCounts[i] == 0 iff s_configs[i] is unusable
+  Config[CONFIG_RING_BUFFER_SIZE] s_configs;
+  uint256 s_latestConfigIndex;
+  bytes32 s_latestConfigDigest;
+
+  /// @param revokePastConfigs if one wants to revoke all past configs, because some past config is faulty
+  function setConfig(Config calldata newConfig, bool revokePastConfigs) external onlyOwner {
+    // sanity checks
+    {
+      // no peerId or offchainPublicKey is duplicated
+      for (uint256 i = 0; i < newConfig.nodes.length; ++i) {
+        for (uint256 j = i + 1; j < newConfig.nodes.length; ++j) {
+          if (keccak256(abi.encode(newConfig.nodes[i].peerId)) == keccak256(abi.encode(newConfig.nodes[j].peerId))) {
+            revert DuplicatePeerId();
+          }
+          if (newConfig.nodes[i].offchainPublicKey == newConfig.nodes[j].offchainPublicKey) {
+            revert DuplicateOffchainPublicKey();
+          }
+        }
+      }
+
+      for (uint256 i = 0; i < newConfig.sourceChains.length; ++i) {
+        // source chains are in strictly increasing order of chain selectors
+        if (i > 0 && !(newConfig.sourceChains[i - 1].chainSelector < newConfig.sourceChains[i].chainSelector)) {
+          revert OutOfOrderSourceChains();
+        }
+
+        // all observerNodeIndices are valid
+        for (uint256 j = 0; j < newConfig.sourceChains[i].observerNodeIndices.length; ++j) {
+          if (
+            j > 0
+              && !(newConfig.sourceChains[i].observerNodeIndices[j - 1] < newConfig.sourceChains[i].observerNodeIndices[j])
+          ) {
+            revert OutOfOrderObserverNodeIndices();
+          }
+          if (!(newConfig.sourceChains[i].observerNodeIndices[j] < newConfig.nodes.length)) {
+            revert OutOfBoundsObserverNodeIndex();
+          }
+        }
+
+        // minObservers are tenable
+        if (!(newConfig.sourceChains[i].minObservers <= newConfig.sourceChains[i].observerNodeIndices.length)) {
+          revert MinObserversTooHigh();
+        }
+      }
+    }
+
+    uint256 oldConfigIndex = s_latestConfigIndex;
+    uint32 oldConfigCount = s_configCounts[oldConfigIndex];
+    uint256 newConfigIndex = (oldConfigIndex + 1) % CONFIG_RING_BUFFER_SIZE;
+
+    for (uint256 i = 0; i < CONFIG_RING_BUFFER_SIZE; ++i) {
+      if ((i == newConfigIndex || revokePastConfigs) && s_configCounts[i] > 0) {
+        emit ConfigRevoked(_configDigest(VersionedConfig({version: s_configCounts[i], config: s_configs[i]})));
+        delete s_configCounts[i];
+      }
+    }
+
+    uint32 newConfigCount = oldConfigCount + 1;
+    VersionedConfig memory newVersionedConfig = VersionedConfig({version: newConfigCount, config: newConfig});
+    bytes32 newConfigDigest = _configDigest(newVersionedConfig);
+    s_configs[newConfigIndex] = newConfig;
+    s_configCounts[newConfigIndex] = newConfigCount;
+    s_latestConfigIndex = newConfigIndex;
+    s_latestConfigDigest = newConfigDigest;
+    emit ConfigSet(newConfigDigest, newVersionedConfig);
+  }
+
+  /// @return configDigest will be zero in case no config has been set
+  function getLatestConfigDigestAndVersionedConfig()
+    external
+    view
+    returns (bytes32 configDigest, VersionedConfig memory)
+  {
+    return (
+      s_latestConfigDigest,
+      VersionedConfig({version: s_configCounts[s_latestConfigIndex], config: s_configs[s_latestConfigIndex]})
+    );
+  }
+
+  /// @notice The offchain code can use this to fetch an old config which might still be in use by some remotes
+  /// @dev Only to be called by offchain code, efficiency is not a concern
+  function getConfig(bytes32 configDigest) external view returns (VersionedConfig memory versionedConfig, bool ok) {
+    for (uint256 i = 0; i < CONFIG_RING_BUFFER_SIZE; ++i) {
+      if (s_configCounts[i] == 0) {
+        // unset config
+        continue;
+      }
+      VersionedConfig memory vc = VersionedConfig({version: s_configCounts[i], config: s_configs[i]});
+      if (_configDigest(vc) == configDigest) {
+        versionedConfig = vc;
+        ok = true;
+        break;
+      }
+    }
+  }
+
+  ///
+  /// Events
+  ///
+
+  event ConfigSet(bytes32 configDigest, VersionedConfig versionedConfig);
+  event ConfigRevoked(bytes32 configDigest);
+
+  ///
+  /// Errors
+  ///
+
+  error DuplicatePeerId();
+  error DuplicateOffchainPublicKey();
+  error OutOfOrderSourceChains();
+  error OutOfOrderObserverNodeIndices();
+  error OutOfBoundsObserverNodeIndex();
+  error MinObserversTooHigh();
+}
diff --git a/contracts/src/v0.8/ccip/RMNRemote.sol b/contracts/src/v0.8/ccip/RMNRemote.sol
new file mode 100644
index 0000000000..19b7f89e1b
--- /dev/null
+++ b/contracts/src/v0.8/ccip/RMNRemote.sol
@@ -0,0 +1,167 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.24;
+
+import "@openzeppelin/contracts/access/Ownable2Step.sol";
+
+import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
+
+bytes32 constant RMN_V1_6_ANY2EVM_REPORT = keccak256("RMN_V1_6_ANY2EVM_REPORT");
+
+/// @notice This contract supports verification of RMN reports for any Any2EVM OffRamp.
+contract RMNRemote is Ownable2Step, ITypeAndVersion {
+  /// @dev temp placeholder to exclude this contract from coverage
+  function test() public {}
+
+  string public constant override typeAndVersion = "RMNRemote 1.6.0-dev";
+
+  uint64 internal immutable i_chainSelector;
+
+  constructor(uint64 chainSelector) {
+    i_chainSelector = chainSelector;
+  }
+
+  struct Signer {
+    address onchainPublicKey; // for signing reports
+    uint64 nodeIndex; // maps to nodes in home chain config, should be strictly increasing
+  }
+
+  struct Config {
+    bytes32 rmnHomeContractConfigDigest;
+    Signer[] signers;
+    uint64 minSigners;
+  }
+
+  struct VersionedConfig {
+    uint32 version;
+    Config config;
+  }
+
+  Config s_config;
+  uint32 s_configCount;
+
+  mapping(address signer => bool exists) s_signers; // for more gas efficient verify
+
+  function setConfig(Config calldata newConfig) external onlyOwner {
+    // sanity checks
+    {
+      // signers are in ascending order of nodeIndex
+      for (uint256 i = 1; i < newConfig.signers.length; ++i) {
+        if (!(newConfig.signers[i - 1].nodeIndex < newConfig.signers[i].nodeIndex)) {
+          revert InvalidSignerOrder();
+        }
+      }
+
+      // minSigners is tenable
+      if (!(newConfig.minSigners <= newConfig.signers.length)) {
+        revert MinSignersTooHigh();
+      }
+    }
+
+    // clear the old signers
+    {
+      Config storage oldConfig = s_config;
+      while (oldConfig.signers.length > 0) {
+        delete s_signers[oldConfig.signers[oldConfig.signers.length - 1].onchainPublicKey];
+        oldConfig.signers.pop();
+      }
+    }
+
+    // set the new signers
+    {
+      for (uint256 i = 0; i < newConfig.signers.length; ++i) {
+        if (s_signers[newConfig.signers[i].onchainPublicKey]) {
+          revert DuplicateOnchainPublicKey();
+        }
+        s_signers[newConfig.signers[i].onchainPublicKey] = true;
+      }
+    }
+
+    s_config = newConfig;
+    uint32 newConfigCount = ++s_configCount;
+    emit ConfigSet(VersionedConfig({version: newConfigCount, config: newConfig}));
+  }
+
+  function getVersionedConfig() external view returns (VersionedConfig memory) {
+    return VersionedConfig({version: s_configCount, config: s_config});
+  }
+
+  /// @notice The part of the LaneUpdate for a fixed destination chain and OffRamp, to avoid verbosity in Report
+  struct DestLaneUpdate {
+    uint64 sourceChainSelector;
+    bytes onrampAddress; // generic, to support arbitrary sources; for EVM2EVM, use abi.encodePacked
+    uint64 minMsgNr;
+    uint64 maxMsgNr;
+    bytes32 root;
+  }
+
+  struct Report {
+    uint256 destChainId; // to guard against chain selector misconfiguration
+    uint64 destChainSelector;
+    address rmnRemoteContractAddress;
+    address offrampAddress;
+    bytes32 rmnHomeContractConfigDigest;
+    DestLaneUpdate[] destLaneUpdates;
+  }
+
+  struct Signature {
+    bytes32 r;
+    bytes32 s;
+  }
+
+  /// @notice Verifies signatures of RMN nodes, on dest lane updates as provided in the CommitReport
+  /// @param destLaneUpdates must be well formed, and is a representation of the CommitReport received from the oracles
+  /// @param signatures must be sorted in ascending order by signer address
+  /// @dev Will revert if verification fails. Needs to be called by the OffRamp for which the signatures are produced,
+  /// otherwise verification will fail.
+  function verify(DestLaneUpdate[] memory destLaneUpdates, Signature[] memory signatures) external view {
+    if (s_configCount == 0) {
+      revert ConfigNotSet();
+    }
+
+    bytes32 signedHash = keccak256(
+      abi.encode(
+        RMN_V1_6_ANY2EVM_REPORT,
+        Report({
+          destChainId: block.chainid,
+          destChainSelector: i_chainSelector,
+          rmnRemoteContractAddress: address(this),
+          offrampAddress: msg.sender,
+          rmnHomeContractConfigDigest: s_config.rmnHomeContractConfigDigest,
+          destLaneUpdates: destLaneUpdates
+        })
+      )
+    );
+
+    uint256 numSigners = 0;
+    address prevAddress = address(0);
+    for (uint256 i = 0; i < signatures.length; ++i) {
+      Signature memory sig = signatures[i];
+      address signerAddress = ecrecover(signedHash, 27, sig.r, sig.s);
+      if (signerAddress == address(0)) revert InvalidSignature();
+      if (!(prevAddress < signerAddress)) revert OutOfOrderSignatures();
+      if (!s_signers[signerAddress]) revert UnexpectedSigner();
+      prevAddress = signerAddress;
+      ++numSigners;
+    }
+    if (numSigners < s_config.minSigners) revert ThresholdNotMet();
+  }
+
+  ///
+  /// Events
+  ///
+
+  event ConfigSet(VersionedConfig versionedConfig);
+
+  ///
+  /// Errors
+  ///
+
+  error InvalidSignature();
+  error OutOfOrderSignatures();
+  error UnexpectedSigner();
+  error ThresholdNotMet();
+  error ConfigNotSet();
+  error InvalidSignerOrder();
+  error MinSignersTooHigh();
+  error DuplicateOnchainPublicKey();
+}
diff --git a/contracts/src/v0.8/ccip/applications/CCIPClientExample.sol b/contracts/src/v0.8/ccip/applications/CCIPClientExample.sol
index b105cf8b00..77816ceadb 100644
--- a/contracts/src/v0.8/ccip/applications/CCIPClientExample.sol
+++ b/contracts/src/v0.8/ccip/applications/CCIPClientExample.sol
@@ -57,13 +57,9 @@ contract CCIPClientExample is CCIPReceiver, OwnerIsCreator {
     delete s_chains[chainSelector];
   }
 
-  function ccipReceive(Client.Any2EVMMessage calldata message)
-    external
-    virtual
-    override
-    onlyRouter
-    validChain(message.sourceChainSelector)
-  {
+  function ccipReceive(
+    Client.Any2EVMMessage calldata message
+  ) external virtual override onlyRouter validChain(message.sourceChainSelector) {
     // Extremely important to ensure only router calls this.
     // Tokens in message if any will be transferred to this contract
     // TODO: Validate sender/origin chain and process message and/or tokens.
diff --git a/contracts/src/v0.8/ccip/applications/DefensiveExample.sol b/contracts/src/v0.8/ccip/applications/DefensiveExample.sol
index 30b0972bb3..89435ccbf1 100644
--- a/contracts/src/v0.8/ccip/applications/DefensiveExample.sol
+++ b/contracts/src/v0.8/ccip/applications/DefensiveExample.sol
@@ -45,12 +45,9 @@ contract DefensiveExample is CCIPClientExample {
   /// never revert, all errors should be handled internally in this contract.
   /// @param message The message to process.
   /// @dev Extremely important to ensure only router calls this.
-  function ccipReceive(Client.Any2EVMMessage calldata message)
-    external
-    override
-    onlyRouter
-    validChain(message.sourceChainSelector)
-  {
+  function ccipReceive(
+    Client.Any2EVMMessage calldata message
+  ) external override onlyRouter validChain(message.sourceChainSelector) {
     try this.processMessage(message) {}
     catch (bytes memory err) {
       // Could set different error codes based on the caught error. Each could be
@@ -70,11 +67,9 @@ contract DefensiveExample is CCIPClientExample {
   /// @dev This example just sends the tokens to the owner of this contracts. More
   /// interesting functions could be implemented.
   /// @dev It has to be external because of the try/catch.
-  function processMessage(Client.Any2EVMMessage calldata message)
-    external
-    onlySelf
-    validChain(message.sourceChainSelector)
-  {
+  function processMessage(
+    Client.Any2EVMMessage calldata message
+  ) external onlySelf validChain(message.sourceChainSelector) {
     // Simulate a revert
     if (s_simRevert) revert ErrorCase();
 
diff --git a/contracts/src/v0.8/ccip/applications/EtherSenderReceiver.sol b/contracts/src/v0.8/ccip/applications/EtherSenderReceiver.sol
index ce8ed1ff7a..05d604d9c1 100644
--- a/contracts/src/v0.8/ccip/applications/EtherSenderReceiver.sol
+++ b/contracts/src/v0.8/ccip/applications/EtherSenderReceiver.sol
@@ -115,11 +115,9 @@ contract EtherSenderReceiver is CCIPReceiver, ITypeAndVersion {
   /// @notice Validate the message content.
   /// @dev Only allows a single token to be sent. Always overwritten to be address(i_weth)
   /// and receiver is always msg.sender.
-  function _validatedMessage(Client.EVM2AnyMessage calldata message)
-    internal
-    view
-    returns (Client.EVM2AnyMessage memory)
-  {
+  function _validatedMessage(
+    Client.EVM2AnyMessage calldata message
+  ) internal view returns (Client.EVM2AnyMessage memory) {
     Client.EVM2AnyMessage memory validatedMessage = message;
 
     if (validatedMessage.tokenAmounts.length != 1) {
diff --git a/contracts/src/v0.8/ccip/applications/PingPongDemo.sol b/contracts/src/v0.8/ccip/applications/PingPongDemo.sol
index 5144b3ed4c..b902c47618 100644
--- a/contracts/src/v0.8/ccip/applications/PingPongDemo.sol
+++ b/contracts/src/v0.8/ccip/applications/PingPongDemo.sol
@@ -37,7 +37,7 @@ contract PingPongDemo is CCIPReceiver, OwnerIsCreator, ITypeAndVersion {
   }
 
   function typeAndVersion() external pure virtual returns (string memory) {
-    return "PingPongDemo 1.2.0";
+    return "PingPongDemo 1.5.0";
   }
 
   function setCounterpart(uint64 counterpartChainSelector, address counterpartAddress) external onlyOwner {
@@ -62,7 +62,7 @@ contract PingPongDemo is CCIPReceiver, OwnerIsCreator, ITypeAndVersion {
       tokenAmounts: new Client.EVMTokenAmount[](0),
       extraArgs: Client._argsToBytes(
         Client.EVMExtraArgsV2({gasLimit: uint256(DEFAULT_GAS_LIMIT), allowOutOfOrderExecution: s_outOfOrderExecution})
-        ),
+      ),
       feeToken: address(s_feeToken)
     });
     IRouterClient(getRouter()).ccipSend(s_counterpartChainSelector, message);
diff --git a/contracts/src/v0.8/ccip/applications/SelfFundedPingPong.sol b/contracts/src/v0.8/ccip/applications/SelfFundedPingPong.sol
index 80bc7bb24a..f9e4fd0aa6 100644
--- a/contracts/src/v0.8/ccip/applications/SelfFundedPingPong.sol
+++ b/contracts/src/v0.8/ccip/applications/SelfFundedPingPong.sol
@@ -9,7 +9,7 @@ import {PingPongDemo} from "./PingPongDemo.sol";
 import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
 contract SelfFundedPingPong is PingPongDemo {
-  string public constant override typeAndVersion = "SelfFundedPingPong 1.2.0";
+  string public constant override typeAndVersion = "SelfFundedPingPong 1.5.0";
 
   event Funded();
   event CountIncrBeforeFundingSet(uint8 countIncrBeforeFunding);
diff --git a/contracts/src/v0.8/ccip/capability/CCIPConfig.sol b/contracts/src/v0.8/ccip/capability/CCIPConfig.sol
index 6d310f989b..ae1e4cc597 100644
--- a/contracts/src/v0.8/ccip/capability/CCIPConfig.sol
+++ b/contracts/src/v0.8/ccip/capability/CCIPConfig.sol
@@ -105,6 +105,8 @@ contract CCIPConfig is ITypeAndVersion, ICapabilityConfiguration, OwnerIsCreator
   }
 
   /// @notice Returns all the chain configurations.
+  /// @param pageIndex The page index.
+  /// @param pageSize The page size.
   /// @return paginatedChainConfigs chain configurations.
   function getAllChainConfigs(
     uint256 pageIndex,
@@ -181,6 +183,10 @@ contract CCIPConfig is ITypeAndVersion, ICapabilityConfiguration, OwnerIsCreator
     }
   }
 
+  /// @notice Sets a new OCR3 config for a specific plugin type for a DON.
+  /// @param donId The DON ID.
+  /// @param pluginType The plugin type.
+  /// @param newConfig The new configuration.
   function _updatePluginConfig(
     uint32 donId,
     Internal.OCRPluginType pluginType,
@@ -221,11 +227,14 @@ contract CCIPConfig is ITypeAndVersion, ICapabilityConfiguration, OwnerIsCreator
     return CCIPConfigTypes.ConfigState(configLen);
   }
 
-  // the only valid state transitions are the following:
-  // init    -> running (first ever config)
-  // running -> staging (blue/green proposal)
-  // staging -> running (promotion)
-  // everything else is invalid and should revert.
+  /// @notice Validates the state transition between two config states.
+  /// The only valid state transitions are the following:
+  /// Init    -> Running (first ever config)
+  /// Running -> Staging (blue/green proposal)
+  /// Staging -> Running (promotion)
+  /// Everything else is invalid and should revert.
+  /// @param currentState The current state.
+  /// @param newState The new state.
   function _validateConfigStateTransition(
     CCIPConfigTypes.ConfigState currentState,
     CCIPConfigTypes.ConfigState newState
@@ -244,6 +253,9 @@ contract CCIPConfig is ITypeAndVersion, ICapabilityConfiguration, OwnerIsCreator
     revert InvalidConfigStateTransition(currentState, newState);
   }
 
+  /// @notice Validates the transition between two OCR3 configurations.
+  /// @param currentConfig The current configuration with metadata.
+  /// @param newConfigWithMeta The new configuration with metadata.
   function _validateConfigTransition(
     CCIPConfigTypes.OCR3ConfigWithMeta[] memory currentConfig,
     CCIPConfigTypes.OCR3ConfigWithMeta[] memory newConfigWithMeta
@@ -332,7 +344,11 @@ contract CCIPConfig is ITypeAndVersion, ICapabilityConfiguration, OwnerIsCreator
 
   /// @notice Group the OCR3 configurations by plugin type for further processing.
   /// @param ocr3Configs The OCR3 configurations to group.
-  function _groupByPluginType(CCIPConfigTypes.OCR3Config[] memory ocr3Configs)
+  /// @return commitConfigs The commit configurations.
+  /// @return execConfigs The execution configurations.
+  function _groupByPluginType(
+    CCIPConfigTypes.OCR3Config[] memory ocr3Configs
+  )
     internal
     pure
     returns (CCIPConfigTypes.OCR3Config[] memory commitConfigs, CCIPConfigTypes.OCR3Config[] memory execConfigs)
@@ -368,6 +384,8 @@ contract CCIPConfig is ITypeAndVersion, ICapabilityConfiguration, OwnerIsCreator
     return (commitConfigs, execConfigs);
   }
 
+  /// @notice Validates an OCR3 configuration.
+  /// @param cfg The OCR3 configuration.
   function _validateConfig(CCIPConfigTypes.OCR3Config memory cfg) internal view {
     if (cfg.chainSelector == 0) revert ChainSelectorNotSet();
     if (cfg.pluginType != Internal.OCRPluginType.Commit && cfg.pluginType != Internal.OCRPluginType.Execution) {
diff --git a/contracts/src/v0.8/ccip/interfaces/IEVM2AnyOnRampClient.sol b/contracts/src/v0.8/ccip/interfaces/IEVM2AnyOnRampClient.sol
index 1744d6c229..1dfae1abbc 100644
--- a/contracts/src/v0.8/ccip/interfaces/IEVM2AnyOnRampClient.sol
+++ b/contracts/src/v0.8/ccip/interfaces/IEVM2AnyOnRampClient.sol
@@ -33,6 +33,7 @@ interface IEVM2AnyOnRampClient {
   /// @param message Message struct to send
   /// @param feeTokenAmount Amount of fee tokens for payment
   /// @param originalSender The original initiator of the CCIP request
+  /// @return messageId The message id
   function forwardFromRouter(
     uint64 destChainSelector,
     Client.EVM2AnyMessage memory message,
diff --git a/contracts/src/v0.8/ccip/interfaces/IFeeQuoter.sol b/contracts/src/v0.8/ccip/interfaces/IFeeQuoter.sol
new file mode 100644
index 0000000000..fdea4538b6
--- /dev/null
+++ b/contracts/src/v0.8/ccip/interfaces/IFeeQuoter.sol
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {Client} from "../libraries/Client.sol";
+import {Internal} from "../libraries/Internal.sol";
+import {IPriceRegistry} from "./IPriceRegistry.sol";
+
+interface IFeeQuoter is IPriceRegistry {
+  /// @notice Token price data feed configuration
+  struct TokenPriceFeedConfig {
+    address dataFeedAddress; // ──╮ AggregatorV3Interface contract (0 - feed is unset)
+    uint8 tokenDecimals; // ──────╯ Decimals of the token that the feed represents
+  }
+
+  /// @notice Returns the token price data feed configuration
+  /// @param token The token to retrieve the feed config for
+  /// @return tokenPriceFeedConfig The token price data feed config (if feed address is 0, the feed config is disabled)
+  function getTokenPriceFeedConfig(address token) external view returns (TokenPriceFeedConfig memory);
+
+  /// @notice Validates the ccip message & returns the fee
+  /// @param destChainSelector The destination chain selector.
+  /// @param message The message to get quote for.
+  /// @return feeTokenAmount The amount of fee token needed for the fee, in smallest denomination of the fee token.
+  function getValidatedFee(
+    uint64 destChainSelector,
+    Client.EVM2AnyMessage calldata message
+  ) external view returns (uint256 feeTokenAmount);
+
+  /// @notice Converts the extraArgs to the latest version and returns the converted message fee in juels
+  /// @param destChainSelector destination chain selector to process
+  /// @param feeToken Fee token address used to pay for message fees
+  /// @param feeTokenAmount Fee token amount
+  /// @param extraArgs Message extra args that were passed in by the client
+  /// @return msgFeeJuels message fee in juels
+  /// @return isOutOfOrderExecution true if the message should be executed out of order
+  /// @return convertedExtraArgs extra args converted to the latest family-specific args version
+  function processMessageArgs(
+    uint64 destChainSelector,
+    address feeToken,
+    uint256 feeTokenAmount,
+    bytes memory extraArgs
+  ) external view returns (uint256 msgFeeJuels, bool isOutOfOrderExecution, bytes memory convertedExtraArgs);
+
+  /// @notice Validates pool return data
+  /// @param destChainSelector Destination chain selector to which the token amounts are sent to
+  /// @param rampTokenAmounts Token amounts with populated pool return data
+  /// @param sourceTokenAmounts Token amounts originally sent in a Client.EVM2AnyMessage message
+  /// @return destExecData Destination chain execution data
+  function processPoolReturnData(
+    uint64 destChainSelector,
+    Internal.RampTokenAmount[] memory rampTokenAmounts,
+    Client.EVMTokenAmount[] calldata sourceTokenAmounts
+  ) external view returns (bytes[] memory);
+}
diff --git a/contracts/src/v0.8/ccip/interfaces/INonceManager.sol b/contracts/src/v0.8/ccip/interfaces/INonceManager.sol
index 52408ae4f5..3a6eff65c7 100644
--- a/contracts/src/v0.8/ccip/interfaces/INonceManager.sol
+++ b/contracts/src/v0.8/ccip/interfaces/INonceManager.sol
@@ -3,18 +3,18 @@ pragma solidity ^0.8.0;
 
 /// @notice Contract interface that allows managing sender nonces
 interface INonceManager {
-  /// @notice Increments the outbound nonce for a given sender on a given destination chain
-  /// @param destChainSelector The destination chain selector
-  /// @param sender The sender address
-  /// @return The new outbound nonce
+  /// @notice Increments the outbound nonce for a given sender on a given destination chain.
+  /// @param destChainSelector The destination chain selector.
+  /// @param sender The sender address.
+  /// @return incrementedOutboundNonce The new outbound nonce.
   function getIncrementedOutboundNonce(uint64 destChainSelector, address sender) external returns (uint64);
 
-  /// @notice Increments the inbound nonce for a given sender on a given source chain
-  /// @notice The increment is only applied if the resulting nonce matches the expectedNonce
-  /// @param sourceChainSelector The destination chain selector
-  /// @param expectedNonce The expected inbound nonce
-  /// @param sender The encoded sender address
-  /// @return True if the nonce was incremented, false otherwise
+  /// @notice Increments the inbound nonce for a given sender on a given source chain.
+  /// @notice The increment is only applied if the resulting nonce matches the expectedNonce.
+  /// @param sourceChainSelector The destination chain selector.
+  /// @param expectedNonce The expected inbound nonce.
+  /// @param sender The encoded sender address.
+  /// @return incremented True if the nonce was incremented, false otherwise.
   function incrementInboundNonce(
     uint64 sourceChainSelector,
     uint64 expectedNonce,
diff --git a/contracts/src/v0.8/ccip/interfaces/IPool.sol b/contracts/src/v0.8/ccip/interfaces/IPool.sol
index e01f5fe38e..a2b9281228 100644
--- a/contracts/src/v0.8/ccip/interfaces/IPool.sol
+++ b/contracts/src/v0.8/ccip/interfaces/IPool.sol
@@ -11,9 +11,9 @@ interface IPoolV1 is IERC165 {
   /// @notice Lock tokens into the pool or burn the tokens.
   /// @param lockOrBurnIn Encoded data fields for the processing of tokens on the source chain.
   /// @return lockOrBurnOut Encoded data fields for the processing of tokens on the destination chain.
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    external
-    returns (Pool.LockOrBurnOutV1 memory lockOrBurnOut);
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) external returns (Pool.LockOrBurnOutV1 memory lockOrBurnOut);
 
   /// @notice Releases or mints tokens to the receiver address.
   /// @param releaseOrMintIn All data required to release or mint tokens.
@@ -21,9 +21,9 @@ interface IPoolV1 is IERC165 {
   /// in the local token's decimals.
   /// @dev The offramp asserts that the balanceOf of the receiver has been incremented by exactly the number
   /// of tokens that is returned in ReleaseOrMintOutV1.destinationAmount. If the amounts do not match, the tx reverts.
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    external
-    returns (Pool.ReleaseOrMintOutV1 memory);
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) external returns (Pool.ReleaseOrMintOutV1 memory);
 
   /// @notice Checks whether a remote chain is supported in the token pool.
   /// @param remoteChainSelector The selector of the remote chain.
diff --git a/contracts/src/v0.8/ccip/interfaces/IPriceRegistry.sol b/contracts/src/v0.8/ccip/interfaces/IPriceRegistry.sol
index 8a20299371..757ef09b0c 100644
--- a/contracts/src/v0.8/ccip/interfaces/IPriceRegistry.sol
+++ b/contracts/src/v0.8/ccip/interfaces/IPriceRegistry.sol
@@ -5,12 +5,6 @@ import {Client} from "../libraries/Client.sol";
 import {Internal} from "../libraries/Internal.sol";
 
 interface IPriceRegistry {
-  /// @notice Token price data feed configuration
-  struct TokenPriceFeedConfig {
-    address dataFeedAddress; // ──╮ AggregatorV3Interface contract (0 - feed is unset)
-    uint8 tokenDecimals; // ──────╯ Decimals of the token that the feed represents
-  }
-
   /// @notice Update the price for given tokens and gas prices for given chains.
   /// @param priceUpdates The price updates to apply.
   function updatePrices(Internal.PriceUpdates memory priceUpdates) external;
@@ -30,11 +24,6 @@ interface IPriceRegistry {
   /// @return tokenPrices The tokenPrices for the given tokens.
   function getTokenPrices(address[] calldata tokens) external view returns (Internal.TimestampedPackedUint224[] memory);
 
-  /// @notice Returns the token price data feed configuration
-  /// @param token The token to retrieve the feed config for
-  /// @return dataFeedAddress The token price data feed config (if feed address is 0, the feed config is disabled)
-  function getTokenPriceFeedConfig(address token) external view returns (TokenPriceFeedConfig memory);
-
   /// @notice Get an encoded `gasPrice` for a given destination chain ID.
   /// The 224-bit result encodes necessary gas price components.
   /// On L1 chains like Ethereum or Avax, the only component is the gas price.
@@ -43,10 +32,9 @@ interface IPriceRegistry {
   /// PriceRegistry does not contain chain-specific logic to parse destination chain price components.
   /// @param destChainSelector The destination chain to get the price for.
   /// @return gasPrice The encoded gasPrice for the given destination chain ID.
-  function getDestinationChainGasPrice(uint64 destChainSelector)
-    external
-    view
-    returns (Internal.TimestampedPackedUint224 memory);
+  function getDestinationChainGasPrice(
+    uint64 destChainSelector
+  ) external view returns (Internal.TimestampedPackedUint224 memory);
 
   /// @notice Gets the fee token price and the gas price, both denominated in dollars.
   /// @param token The source token to get the price for.
@@ -70,7 +58,7 @@ interface IPriceRegistry {
   ) external view returns (uint256 toTokenAmount);
 
   /// @notice Get the list of fee tokens.
-  /// @return The tokens set as fee tokens.
+  /// @return feeTokens The tokens set as fee tokens.
   function getFeeTokens() external view returns (address[] memory);
 
   /// @notice Validates the ccip message & returns the fee
@@ -101,9 +89,10 @@ interface IPriceRegistry {
   /// @param destChainSelector Destination chain selector to which the token amounts are sent to
   /// @param rampTokenAmounts Token amounts with populated pool return data
   /// @param sourceTokenAmounts Token amounts originally sent in a Client.EVM2AnyMessage message
-  function validatePoolReturnData(
+  /// @return destExecData Destination chain execution data
+  function processPoolReturnData(
     uint64 destChainSelector,
-    Internal.RampTokenAmount[] calldata rampTokenAmounts,
+    Internal.RampTokenAmount[] memory rampTokenAmounts,
     Client.EVMTokenAmount[] calldata sourceTokenAmounts
-  ) external view;
+  ) external view returns (bytes[] memory);
 }
diff --git a/contracts/src/v0.8/ccip/libraries/Internal.sol b/contracts/src/v0.8/ccip/libraries/Internal.sol
index bd1ee48d9a..9b251eedcf 100644
--- a/contracts/src/v0.8/ccip/libraries/Internal.sol
+++ b/contracts/src/v0.8/ccip/libraries/Internal.sol
@@ -140,10 +140,11 @@ library Internal {
   uint256 public constant ANY_2_EVM_MESSAGE_FIXED_BYTES = 32 * 14;
 
   /// @dev Each token transfer adds 1 RampTokenAmount
-  /// RampTokenAmount has 4 fields, including 3 bytes.
-  /// Each bytes takes 1 more slot to store its length, and one slot to store the offset.
-  /// When abi encoded, each token transfer takes up 10 slots, excl bytes contents.
-  uint256 public constant ANY_2_EVM_MESSAGE_FIXED_BYTES_PER_TOKEN = 32 * 10;
+  /// RampTokenAmount has 5 fields, 3 of which are bytes type, 1 uint256 and 1 uint32.
+  /// Each bytes type takes 1 slot for length, 1 slot for data and 1 slot for the offset.
+  /// uint256 amount takes 1 slot.
+  /// uint32 destGasAmount takes 1 slot.
+  uint256 public constant ANY_2_EVM_MESSAGE_FIXED_BYTES_PER_TOKEN = 32 * ((3 * 3) + 2);
 
   bytes32 internal constant EVM_2_EVM_MESSAGE_HASH = keccak256("EVM2EVMMessageHashV2");
 
@@ -294,6 +295,9 @@ library Internal {
     // has to be set for the specific token.
     bytes extraData;
     uint256 amount; // Amount of tokens.
+    // Destination chain specific execution data encoded in bytes
+    //(for EVM destination it consists of the amount of gas available for the releaseOrMint and transfer calls on the offRamp
+    bytes destExecData;
   }
 
   /// @notice Family-agnostic header for OnRamp & OffRamp messages.
diff --git a/contracts/src/v0.8/ccip/ocr/MultiOCR3Base.sol b/contracts/src/v0.8/ccip/ocr/MultiOCR3Base.sol
index 1872ae276c..0b90f88c11 100644
--- a/contracts/src/v0.8/ccip/ocr/MultiOCR3Base.sol
+++ b/contracts/src/v0.8/ccip/ocr/MultiOCR3Base.sol
@@ -10,7 +10,7 @@ abstract contract MultiOCR3Base is ITypeAndVersion, OwnerIsCreator {
   // Maximum number of oracles the offchain reporting protocol is designed for
   uint256 internal constant MAX_NUM_ORACLES = 31;
 
-  /// @notice triggers a new run of the offchain reporting protocol
+  /// @notice Triggers a new run of the offchain reporting protocol
   /// @param ocrPluginType OCR plugin type for which the config was set
   /// @param configDigest configDigest of this configuration
   /// @param signers ith element is address ith oracle uses to sign a report
@@ -18,7 +18,7 @@ abstract contract MultiOCR3Base is ITypeAndVersion, OwnerIsCreator {
   /// @param F maximum number of faulty/dishonest oracles the protocol can tolerate while still working correctly
   event ConfigSet(uint8 ocrPluginType, bytes32 configDigest, address[] signers, address[] transmitters, uint8 F);
 
-  /// @notice optionally emitted to indicate the latest configDigest and sequence number
+  /// @notice Optionally emitted to indicate the latest configDigest and sequence number
   /// for which a report was successfully transmitted. Alternatively, the contract may
   /// use latestConfigDigestAndEpoch with scanLogs set to false.
   event Transmitted(uint8 indexed ocrPluginType, bytes32 configDigest, uint64 sequenceNumber);
@@ -71,14 +71,14 @@ abstract contract MultiOCR3Base is ITypeAndVersion, OwnerIsCreator {
     Role role; // ─────╯ Role of the address which mapped to this struct
   }
 
-  /// @notice OCR configuration for a single OCR plugin within a DON
+  /// @notice OCR configuration for a single OCR plugin within a DON.
   struct OCRConfig {
     ConfigInfo configInfo; //  latest OCR config
     address[] signers; //      addresses oracles use to sign the reports
     address[] transmitters; // addresses oracles use to transmit the reports
   }
 
-  /// @notice Args to update an OCR Config
+  /// @notice Args to update an OCR Config.
   struct OCRConfigArgs {
     bytes32 configDigest; // Config digest to update to
     uint8 ocrPluginType; // ──────────────────╮ OCR plugin type to update config for
@@ -98,15 +98,15 @@ abstract contract MultiOCR3Base is ITypeAndVersion, OwnerIsCreator {
   // See the "If we wanted to call sam" example on for example reasoning
   // https://solidity.readthedocs.io/en/v0.7.2/abi-spec.html
 
-  /// @notice constant length component for transmit functions with no signatures.
-  /// The signatures are expected to match transmitPlugin(reportContext, report)
+  /// @notice Constant length component for transmit functions with no signatures.
+  /// The signatures are expected to match transmitPlugin(reportContext, report).
   uint16 private constant TRANSMIT_MSGDATA_CONSTANT_LENGTH_COMPONENT_NO_SIGNATURES = 4 // function selector
     + 3 * 32 // 3 words containing reportContext
     + 32 // word containing start location of abiencoded report value
     + 32; // word containing length of report
 
-  /// @notice extra constant length component for transmit functions with signatures (relative to no signatures)
-  /// The signatures are expected to match transmitPlugin(reportContext, report, rs, ss, rawVs)
+  /// @notice Extra constant length component for transmit functions with signatures (relative to no signatures).
+  /// The signatures are expected to match transmitPlugin(reportContext, report, rs, ss, rawVs).
   uint16 private constant TRANSMIT_MSGDATA_EXTRA_CONSTANT_LENGTH_COMPONENT_FOR_SIGNATURES = 32 // word containing location start of abiencoded rs value
     + 32 // word containing start location of abiencoded ss value
     + 32 // rawVs value
@@ -119,18 +119,18 @@ abstract contract MultiOCR3Base is ITypeAndVersion, OwnerIsCreator {
     i_chainID = block.chainid;
   }
 
-  /// @notice sets offchain reporting protocol configuration incl. participating oracles
+  /// @notice Sets offchain reporting protocol configuration incl. participating oracles.
   /// NOTE: The OCR3 config must be sanity-checked against the home-chain registry configuration, to ensure
   /// home-chain and remote-chain parity!
-  /// @param ocrConfigArgs OCR config update args
+  /// @param ocrConfigArgs OCR config update args.
   function setOCR3Configs(OCRConfigArgs[] memory ocrConfigArgs) external onlyOwner {
     for (uint256 i; i < ocrConfigArgs.length; ++i) {
       _setOCR3Config(ocrConfigArgs[i]);
     }
   }
 
-  /// @notice sets offchain reporting protocol configuration incl. participating oracles for a single OCR plugin type
-  /// @param ocrConfigArgs OCR config update args
+  /// @notice Sets offchain reporting protocol configuration incl. participating oracles for a single OCR plugin type.
+  /// @param ocrConfigArgs OCR config update args.
   function _setOCR3Config(OCRConfigArgs memory ocrConfigArgs) internal {
     if (ocrConfigArgs.F == 0) revert InvalidConfig(InvalidConfigErrorType.F_MUST_BE_POSITIVE);
 
@@ -180,23 +180,23 @@ abstract contract MultiOCR3Base is ITypeAndVersion, OwnerIsCreator {
     _afterOCR3ConfigSet(ocrPluginType);
   }
 
-  /// @notice Hook that is called after a plugin's OCR3 config changes
-  /// @param ocrPluginType Plugin type for which the config changed
+  /// @notice Hook that is called after a plugin's OCR3 config changes.
+  /// @param ocrPluginType Plugin type for which the config changed.
   function _afterOCR3ConfigSet(uint8 ocrPluginType) internal virtual;
 
-  /// @notice Clears oracle roles for the provided oracle addresses
-  /// @param ocrPluginType OCR plugin type to clear roles for
-  /// @param oracleAddresses Oracle addresses to clear roles for
+  /// @notice Clears oracle roles for the provided oracle addresses.
+  /// @param ocrPluginType OCR plugin type to clear roles for.
+  /// @param oracleAddresses Oracle addresses to clear roles for.
   function _clearOracleRoles(uint8 ocrPluginType, address[] memory oracleAddresses) internal {
     for (uint256 i = 0; i < oracleAddresses.length; ++i) {
       delete s_oracles[ocrPluginType][oracleAddresses[i]];
     }
   }
 
-  /// @notice Assigns oracles roles for the provided oracle addresses with uniqueness verification
-  /// @param ocrPluginType OCR plugin type to assign roles for
-  /// @param oracleAddresses Oracle addresses to assign roles to
-  /// @param role Role to assign
+  /// @notice Assigns oracles roles for the provided oracle addresses with uniqueness verification.
+  /// @param ocrPluginType OCR plugin type to assign roles for.
+  /// @param oracleAddresses Oracle addresses to assign roles to.
+  /// @param role Role to assign.
   function _assignOracleRoles(uint8 ocrPluginType, address[] memory oracleAddresses, Role role) internal {
     for (uint8 i = 0; i < oracleAddresses.length; ++i) {
       address oracle = oracleAddresses[i];
@@ -212,9 +212,9 @@ abstract contract MultiOCR3Base is ITypeAndVersion, OwnerIsCreator {
   ///         The function should be called after the per-DON reporting logic is completed.
   /// @param ocrPluginType OCR plugin type to transmit report for
   /// @param report serialized report, which the signatures are signing.
-  /// @param rs ith element is the R components of the ith signature on report. Must have at most MAX_NUM_ORACLES entries
-  /// @param ss ith element is the S components of the ith signature on report. Must have at most MAX_NUM_ORACLES entries
-  /// @param rawVs ith element is the the V component of the ith signature
+  /// @param rs ith element is the R components of the ith signature on report. Must have at most MAX_NUM_ORACLES entries.
+  /// @param ss ith element is the S components of the ith signature on report. Must have at most MAX_NUM_ORACLES entries.
+  /// @param rawVs ith element is the the V component of the ith signature.
   function _transmit(
     uint8 ocrPluginType,
     // NOTE: If these parameters are changed, expectedMsgDataLength and/or
@@ -280,12 +280,12 @@ abstract contract MultiOCR3Base is ITypeAndVersion, OwnerIsCreator {
     emit Transmitted(ocrPluginType, configDigest, uint64(uint256(reportContext[1])));
   }
 
-  /// @notice verifies the signatures of a hashed report value for one OCR plugin type
-  /// @param ocrPluginType OCR plugin type to transmit report for
-  /// @param hashedReport hashed encoded packing of report + reportContext
-  /// @param rs ith element is the R components of the ith signature on report. Must have at most MAX_NUM_ORACLES entries
-  /// @param ss ith element is the S components of the ith signature on report. Must have at most MAX_NUM_ORACLES entries
-  /// @param rawVs ith element is the the V component of the ith signature
+  /// @notice Verifies the signatures of a hashed report value for one OCR plugin type.
+  /// @param ocrPluginType OCR plugin type to transmit report for.
+  /// @param hashedReport hashed encoded packing of report + reportContext.
+  /// @param rs ith element is the R components of the ith signature on report. Must have at most MAX_NUM_ORACLES entries.
+  /// @param ss ith element is the S components of the ith signature on report. Must have at most MAX_NUM_ORACLES entries.
+  /// @param rawVs ith element is the the V component of the ith signature.
   function _verifySignatures(
     uint8 ocrPluginType,
     bytes32 hashedReport,
@@ -309,14 +309,14 @@ abstract contract MultiOCR3Base is ITypeAndVersion, OwnerIsCreator {
     }
   }
 
-  /// @notice Validates that the chain ID has not diverged after deployment. Reverts if the chain IDs do not match
+  /// @notice Validates that the chain ID has not diverged after deployment. Reverts if the chain IDs do not match.
   function _whenChainNotForked() internal view {
     if (i_chainID != block.chainid) revert ForkedChain(i_chainID, block.chainid);
   }
 
-  /// @notice information about current offchain reporting protocol configuration
-  /// @param ocrPluginType OCR plugin type to return config details for
-  /// @return ocrConfig OCR config for the plugin type
+  /// @notice Information about current offchain reporting protocol configuration.
+  /// @param ocrPluginType OCR plugin type to return config details for.
+  /// @return ocrConfig OCR config for the plugin type.
   function latestConfigDetails(uint8 ocrPluginType) external view returns (OCRConfig memory ocrConfig) {
     return s_ocrConfigs[ocrPluginType];
   }
diff --git a/contracts/src/v0.8/ccip/offRamp/OffRamp.sol b/contracts/src/v0.8/ccip/offRamp/OffRamp.sol
index de03e5fac7..d594597d18 100644
--- a/contracts/src/v0.8/ccip/offRamp/OffRamp.sol
+++ b/contracts/src/v0.8/ccip/offRamp/OffRamp.sol
@@ -3,10 +3,11 @@ pragma solidity 0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 import {IAny2EVMMessageReceiver} from "../interfaces/IAny2EVMMessageReceiver.sol";
+
+import {IFeeQuoter} from "../interfaces/IFeeQuoter.sol";
 import {IMessageInterceptor} from "../interfaces/IMessageInterceptor.sol";
 import {INonceManager} from "../interfaces/INonceManager.sol";
 import {IPoolV1} from "../interfaces/IPool.sol";
-import {IPriceRegistry} from "../interfaces/IPriceRegistry.sol";
 import {IRMN} from "../interfaces/IRMN.sol";
 import {IRouter} from "../interfaces/IRouter.sol";
 import {ITokenAdminRegistry} from "../interfaces/ITokenAdminRegistry.sol";
@@ -26,7 +27,7 @@ import {ERC165Checker} from "../../vendor/openzeppelin-solidity/v5.0.2/contracts
 /// in an OffRamp in a single transaction.
 /// @dev The OnRamp and OffRamp form an xchain upgradeable unit. Any change to one of them
 /// results an onchain upgrade of both contracts.
-/// @dev MultiOCR3Base is used to store multiple OCR configs for both the OffRamp and the CommitStore.
+/// @dev MultiOCR3Base is used to store multiple OCR configs for the OffRamp.
 /// The execution plugin type has to be configured without signature verification, and the commit
 /// plugin type with verification.
 contract OffRamp is ITypeAndVersion, MultiOCR3Base {
@@ -67,6 +68,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
     uint64 indexed sourceChainSelector,
     uint64 indexed sequenceNumber,
     bytes32 indexed messageId,
+    bytes32 messageHash,
     Internal.MessageExecutionState state,
     bytes returnData,
     uint256 gasUsed
@@ -79,13 +81,13 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   event CommitReportAccepted(CommitReport report);
   event RootRemoved(bytes32 root);
 
-  /// @notice Static offRamp config
+  /// @notice Struct that contains the static configuration
   /// @dev RMN depends on this struct, if changing, please notify the RMN maintainers.
   struct StaticConfig {
     uint64 chainSelector; // ───╮  Destination chainSelector
     address rmnProxy; // ───────╯  RMN proxy address
     address tokenAdminRegistry; // Token admin registry address
-    address nonceManager; // Address of the nonce manager
+    address nonceManager; // Nonce manager address
   }
 
   /// @notice Per-chain source config (defining a lane from a Source Chain -> Dest OffRamp)
@@ -96,7 +98,8 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
     bytes onRamp; // OnRamp address on the source chain
   }
 
-  /// @notice SourceChainConfig update args scoped to one source chain
+  /// @notice Same as SourceChainConfig but with source chain selector so that an array of these
+  /// can be passed in the constructor and the applySourceChainConfigUpdates function.
   struct SourceChainConfigArgs {
     IRouter router; // ────────────────╮  Local router to use for messages coming from this source chain
     uint64 sourceChainSelector; //     |  Source chain selector of the config to update
@@ -105,9 +108,9 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   }
 
   /// @notice Dynamic offRamp config
-  /// @dev since OffRampConfig is part of OffRampConfigChanged event, if changing it, we should update the ABI on Atlas
+  /// @dev Since DynamicConfig is part of DynamicConfigSet event, if changing it, we should update the ABI on Atlas
   struct DynamicConfig {
-    address priceRegistry; // ──────────────────────────╮ Price registry address on the local chain
+    address feeQuoter; // ──────────────────────────────╮ FeeQuoter address on the local chain
     uint32 permissionLessExecutionThresholdSeconds; //  │ Waiting time before manual execution is enabled
     uint32 maxTokenTransferGas; //                      │ Maximum amount of gas passed on to token `transfer` call
     uint32 maxPoolReleaseOrMintGas; // ─────────────────╯ Maximum amount of gas passed on to token pool when calling releaseOrMint
@@ -155,7 +158,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   // DYNAMIC CONFIG
   DynamicConfig internal s_dynamicConfig;
 
-  /// @notice SourceConfig per chain
+  /// @notice SourceChainConfig per chain
   /// (forms lane configurations from sourceChainSelector => StaticConfig.chainSelector)
   mapping(uint64 sourceChainSelector => SourceChainConfig sourceChainConfig) internal s_sourceChainConfigs;
 
@@ -166,7 +169,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   mapping(uint64 sourceChainSelector => mapping(uint64 seqNum => uint256 executionStateBitmap)) internal
     s_executionStates;
 
-  // sourceChainSelector => merkleRoot => timestamp when received
+  /// @notice Commit timestamp of merkle roots per source chain
   mapping(uint64 sourceChainSelector => mapping(bytes32 merkleRoot => uint256 timestamp)) internal s_roots;
   /// @dev The sequence number of the last price update
   uint64 private s_latestPriceSequenceNumber;
@@ -213,8 +216,8 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   /// @notice Returns the current execution state of a message based on its sequenceNumber.
   /// @param sourceChainSelector The source chain to get the execution state for
   /// @param sequenceNumber The sequence number of the message to get the execution state for.
-  /// @return The current execution state of the message.
-  /// @dev we use the literal number 128 because using a constant increased gas usage.
+  /// @return executionState The current execution state of the message.
+  /// @dev We use the literal number 128 because using a constant increased gas usage.
   function getExecutionState(
     uint64 sourceChainSelector,
     uint64 sequenceNumber
@@ -231,7 +234,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   /// @param sourceChainSelector The source chain to set the execution state for
   /// @param sequenceNumber The sequence number for which the state will be saved.
   /// @param newState The new value the state will be in after this function is called.
-  /// @dev we use the literal number 128 because using a constant increased gas usage.
+  /// @dev We use the literal number 128 because using a constant increased gas usage.
   function _setExecutionState(
     uint64 sourceChainSelector,
     uint64 sequenceNumber,
@@ -239,7 +242,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   ) internal {
     uint256 offset = (sequenceNumber % 128) * MESSAGE_EXECUTION_STATE_BIT_WIDTH;
     uint256 bitmap = _getSequenceNumberBitmap(sourceChainSelector, sequenceNumber);
-    // to unset any potential existing state we zero the bits of the section the state occupies,
+    // To unset any potential existing state we zero the bits of the section the state occupies,
     // then we do an AND operation to blank out any existing state for the section.
     bitmap &= ~(MESSAGE_EXECUTION_STATE_MASK << offset);
     // Set the new state
@@ -358,7 +361,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
         revert InvalidMessageDestChainSelector(message.header.destChainSelector);
       }
 
-      // We do this hash here instead of in _verifyMessages to avoid two separate loops
+      // We do this hash here instead of in _verify to avoid two separate loops
       // over the same data, which increases gas cost.
       // Hashing all of the message fields ensures that the message being executed is correct and not tampered with.
       // Including the known OnRamp ensures that the message originates from the correct on ramp version
@@ -422,6 +425,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
       // FAILURE   -> FAILURE  no nonce bump
       // FAILURE   -> SUCCESS  no nonce bump
       // UNTOUCHED messages MUST be executed in order always
+      // If nonce == 0 then out of order execution is allowed
       if (message.header.nonce != 0) {
         if (originalState == Internal.MessageExecutionState.UNTOUCHED) {
           // If a nonce is not incremented, that means it was skipped, and we can ignore the message
@@ -470,6 +474,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
         sourceChainSelector,
         message.header.sequenceNumber,
         message.header.messageId,
+        hashedLeaves[i],
         newState,
         returnData,
         gasStart - gasleft()
@@ -480,12 +485,12 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   /// @notice Try executing a message.
   /// @param message Internal.Any2EVMRampMessage memory message.
   /// @param offchainTokenData Data provided by the DON for token transfers.
-  /// @return the new state of the message, being either SUCCESS or FAILURE.
-  /// @return revert data in bytes if CCIP receiver reverted during execution.
+  /// @return executionState The new state of the message, being either SUCCESS or FAILURE.
+  /// @return errData Revert data in bytes if CCIP receiver reverted during execution.
   function _trialExecute(
     Internal.Any2EVMRampMessage memory message,
     bytes[] memory offchainTokenData
-  ) internal returns (Internal.MessageExecutionState, bytes memory) {
+  ) internal returns (Internal.MessageExecutionState executionState, bytes memory) {
     try this.executeSingleMessage(message, offchainTokenData) {}
     catch (bytes memory err) {
       // return the message execution state as FAILURE and the revert data
@@ -496,7 +501,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
     return (Internal.MessageExecutionState.SUCCESS, "");
   }
 
-  /// @notice Execute a single message.
+  /// @notice Executes a single message.
   /// @param message The message that will be executed.
   /// @param offchainTokenData Token transfer data to be passed to TokenPool.
   /// @dev We make this external and callable by the contract itself, in order to try/catch
@@ -563,12 +568,12 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   /// 1. Price updates
   /// 2. A batch of merkle root and sequence number intervals (per-source)
   /// Both have their own, separate, staleness checks, with price updates using the epoch and round
-  /// number of the latest price update. The merkle root checks for staleness based on the seqNums.
+  /// number of the latest price update. The merkle root checks for staleness are based on the seqNums.
   /// They need to be separate because a price report for round t+2 might be included before a report
   /// containing a merkle root for round t+1. This merkle root report for round t+1 is still valid
   /// and should not be rejected. When a report with a stale root but valid price updates is submitted,
   /// we are OK to revert to preserve the invariant that we always revert on invalid sequence number ranges.
-  /// If that happens, prices will be updates in later rounds.
+  /// If that happens, prices will be updated in later rounds.
   function commit(
     bytes32[3] calldata reportContext,
     bytes calldata report,
@@ -587,8 +592,8 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
       if (s_latestPriceSequenceNumber < sequenceNumber) {
         // If prices are not stale, update the latest epoch and round
         s_latestPriceSequenceNumber = sequenceNumber;
-        // And update the prices in the price registry
-        IPriceRegistry(s_dynamicConfig.priceRegistry).updatePrices(commitReport.priceUpdates);
+        // And update the prices in the fee quoter
+        IFeeQuoter(s_dynamicConfig.feeQuoter).updatePrices(commitReport.priceUpdates);
       } else {
         // If prices are stale and the report doesn't contain a root, this report
         // does not have any valid information and we revert.
@@ -604,7 +609,6 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
       _whenNotCursed(sourceChainSelector);
       SourceChainConfig storage sourceChainConfig = _getEnabledSourceChainConfig(sourceChainSelector);
 
-      // If we reached this section, the report should contain a valid root
       if (sourceChainConfig.minSeqNr != root.interval.min || root.interval.min > root.interval.max) {
         revert InvalidInterval(root.sourceChainSelector, root.interval);
       }
@@ -612,7 +616,8 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
       // TODO: confirm how RMN offchain blessing impacts commit report
       bytes32 merkleRoot = root.merkleRoot;
       if (merkleRoot == bytes32(0)) revert InvalidRoot();
-      // Disallow duplicate roots as that would reset the timestamp and
+      // If we reached this section, the report should contain a valid root
+      // We disallow duplicate roots as that would reset the timestamp and
       // delay potential manual execution.
       if (s_roots[root.sourceChainSelector][merkleRoot] != 0) {
         revert RootAlreadyCommitted(root.sourceChainSelector, merkleRoot);
@@ -628,7 +633,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   }
 
   /// @notice Returns the sequence number of the last price update.
-  /// @return the latest price update sequence number.
+  /// @return sequenceNumber The latest price update sequence number.
   function getLatestPriceSequenceNumber() external view returns (uint64) {
     return s_latestPriceSequenceNumber;
   }
@@ -637,7 +642,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   /// If the root was never committed 0 will be returned.
   /// @param sourceChainSelector The source chain selector.
   /// @param root The merkle root to check the commit status for.
-  /// @return the timestamp of the committed root or zero in the case that it was never
+  /// @return timestamp The timestamp of the committed root or zero in the case that it was never
   /// committed.
   function getMerkleRoot(uint64 sourceChainSelector, bytes32 root) external view returns (uint256) {
     return s_roots[sourceChainSelector][root];
@@ -645,7 +650,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
 
   /// @notice Returns if a root is blessed or not.
   /// @param root The merkle root to check the blessing status for.
-  /// @return whether the root is blessed or not.
+  /// @return blessed Whether the root is blessed or not.
   function isBlessed(bytes32 root) public view returns (bool) {
     // TODO: update RMN to also consider the source chain selector for blessing
     return IRMN(i_rmnProxy).isBlessed(IRMN.TaggedRoot({commitStore: address(this), root: root}));
@@ -669,6 +674,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   /// @dev This method uses a merkle tree within a merkle tree, with the hashedLeaves,
   /// proofs and proofFlagBits being used to get the root of the inner tree.
   /// This root is then used as the singular leaf of the outer tree.
+  /// @return timestamp The commit timestamp of the root
   function _verify(
     uint64 sourceChainSelector,
     bytes32[] memory hashedLeaves,
@@ -701,6 +707,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   /// @notice Returns the static config.
   /// @dev This function will always return the same struct as the contents is static and can never change.
   /// RMN depends on this function, if changing, please notify the RMN maintainers.
+  /// @return staticConfig The static config.
   function getStaticConfig() external view returns (StaticConfig memory) {
     return StaticConfig({
       chainSelector: i_chainSelector,
@@ -711,14 +718,14 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   }
 
   /// @notice Returns the current dynamic config.
-  /// @return The current config.
+  /// @return dynamicConfig The current dynamic config.
   function getDynamicConfig() external view returns (DynamicConfig memory) {
     return s_dynamicConfig;
   }
 
   /// @notice Returns the source chain config for the provided source chain selector
   /// @param sourceChainSelector chain to retrieve configuration for
-  /// @return SourceChainConfig config for the source chain
+  /// @return sourceChainConfig The config for the source chain
   function getSourceChainConfig(uint64 sourceChainSelector) external view returns (SourceChainConfig memory) {
     return s_sourceChainConfigs[sourceChainSelector];
   }
@@ -776,7 +783,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   /// @notice Sets the dynamic config.
   /// @param dynamicConfig The dynamic config.
   function _setDynamicConfig(DynamicConfig memory dynamicConfig) internal {
-    if (dynamicConfig.priceRegistry == address(0)) {
+    if (dynamicConfig.feeQuoter == address(0)) {
       revert ZeroAddressNotAllowed();
     }
 
@@ -787,7 +794,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
 
   /// @notice Returns a source chain config with a check that the config is enabled
   /// @param sourceChainSelector Source chain selector to check for cursing
-  /// @return sourceChainConfig Source chain config
+  /// @return sourceChainConfig The source chain config storage pointer
   function _getEnabledSourceChainConfig(uint64 sourceChainSelector) internal view returns (SourceChainConfig storage) {
     SourceChainConfig storage sourceChainConfig = s_sourceChainConfigs[sourceChainSelector];
     if (!sourceChainConfig.isEnabled) {
@@ -840,7 +847,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
     // address is a (compatible) pool contract. _callWithExactGasSafeReturnData will check if the location
     // contains a contract. If it doesn't it reverts with a known error, which we catch gracefully.
     // We call the pool with exact gas to increase resistance against malicious tokens or token pools.
-    // We protects against return data bombs by capping the return data size at MAX_RET_BYTES.
+    // We protect against return data bombs by capping the return data size at MAX_RET_BYTES.
     (bool success, bytes memory returnData, uint256 gasUsedReleaseOrMint) = CallWithExactGas
       ._callWithExactGasSafeReturnData(
       abi.encodeCall(
@@ -862,7 +869,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
       Internal.MAX_RET_BYTES
     );
 
-    // wrap and rethrow the error so we can catch it lower in the stack
+    // Wrap and rethrow the error so we can catch it lower in the stack
     if (!success) revert TokenHandlingError(returnData);
 
     // If the call was successful, the returnData should be the local token address.
@@ -885,6 +892,12 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
     return Client.EVMTokenAmount({token: localToken, amount: localAmount});
   }
 
+  /// @notice Retrieves the balance of a receiver address for a given token.
+  /// @param receiver The address to check the balance of.
+  /// @param token The token address.
+  /// @param gasLimit The gas limit to use for the call.
+  /// @return balance The balance of the receiver.
+  /// @return gasLeft The gas left after the call.
   function _getBalanceOfReceiver(
     address receiver,
     address token,
@@ -913,10 +926,10 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
   /// @param sourceTokenAmounts List of token amounts with source data of the tokens to be released/minted.
   /// @param originalSender The message sender on the source chain.
   /// @param receiver The address that will receive the tokens.
-  /// @param sourceChainSelector The remote source chain selector
+  /// @param sourceChainSelector The remote source chain selector.
   /// @param offchainTokenData Array of token data fetched offchain by the DON.
   /// @return destTokenAmounts local token addresses with amounts
-  /// @dev This function wrappes the token pool call in a try catch block to gracefully handle
+  /// @dev This function wraps the token pool call in a try catch block to gracefully handle
   /// any non-rate limiting errors that may occur. If we encounter a rate limiting related error
   /// we bubble it up. If we encounter a non-rate limiting error we wrap it in a TokenHandlingError.
   function _releaseOrMintTokens(
diff --git a/contracts/src/v0.8/ccip/onRamp/EVM2EVMOnRamp.sol b/contracts/src/v0.8/ccip/onRamp/EVM2EVMOnRamp.sol
index 8ccd94b5e9..0c48b10e64 100644
--- a/contracts/src/v0.8/ccip/onRamp/EVM2EVMOnRamp.sol
+++ b/contracts/src/v0.8/ccip/onRamp/EVM2EVMOnRamp.sol
@@ -716,11 +716,9 @@ contract EVM2EVMOnRamp is IEVM2AnyOnRamp, ILinkAvailable, AggregateRateLimiter,
   }
 
   /// @notice Gets the transfer fee config for a given token.
-  function getTokenTransferFeeConfig(address token)
-    external
-    view
-    returns (TokenTransferFeeConfig memory tokenTransferFeeConfig)
-  {
+  function getTokenTransferFeeConfig(
+    address token
+  ) external view returns (TokenTransferFeeConfig memory tokenTransferFeeConfig) {
     return s_tokenTransferFeeConfig[token];
   }
 
diff --git a/contracts/src/v0.8/ccip/onRamp/OnRamp.sol b/contracts/src/v0.8/ccip/onRamp/OnRamp.sol
index 60d41894fa..3587854e90 100644
--- a/contracts/src/v0.8/ccip/onRamp/OnRamp.sol
+++ b/contracts/src/v0.8/ccip/onRamp/OnRamp.sol
@@ -3,10 +3,10 @@ pragma solidity 0.8.24;
 
 import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 import {IEVM2AnyOnRampClient} from "../interfaces/IEVM2AnyOnRampClient.sol";
+import {IFeeQuoter} from "../interfaces/IFeeQuoter.sol";
 import {IMessageInterceptor} from "../interfaces/IMessageInterceptor.sol";
 import {INonceManager} from "../interfaces/INonceManager.sol";
 import {IPoolV1} from "../interfaces/IPool.sol";
-import {IPriceRegistry} from "../interfaces/IPriceRegistry.sol";
 import {IRMN} from "../interfaces/IRMN.sol";
 import {IRouter} from "../interfaces/IRouter.sol";
 import {ITokenAdminRegistry} from "../interfaces/ITokenAdminRegistry.sol";
@@ -19,12 +19,14 @@ import {USDPriceWith18Decimals} from "../libraries/USDPriceWith18Decimals.sol";
 
 import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {EnumerableSet} from "../../vendor/openzeppelin-solidity/v5.0.2/contracts/utils/structs/EnumerableSet.sol";
 
 /// @notice The OnRamp is a contract that handles lane-specific fee logic
-/// @dev The OnRamp, MultiCommitStore and OffRamp form an xchain upgradeable unit. Any change to one of them
-/// results an onchain upgrade of all 3.
+/// @dev The OnRamp and OffRamp form an xchain upgradeable unit. Any change to one of them
+/// results in an onchain upgrade of all 3.
 contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
   using SafeERC20 for IERC20;
+  using EnumerableSet for EnumerableSet.AddressSet;
   using USDPriceWith18Decimals for uint224;
 
   error CannotSendZeroTokens();
@@ -35,40 +37,51 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
   error CursedByRMN(uint64 sourceChainSelector);
   error GetSupportedTokensFunctionalityRemovedCheckAdminRegistry();
   error InvalidDestChainConfig(uint64 sourceChainSelector);
+  error OnlyCallableByOwnerOrAllowlistAdmin();
+  error SenderNotAllowed(address sender);
+  error InvalidAllowListRequest(uint64 destChainSelector);
 
   event ConfigSet(StaticConfig staticConfig, DynamicConfig dynamicConfig);
-  event DestChainConfigSet(uint64 indexed destChainSelector, DestChainConfig destChainConfig);
+  event DestChainConfigSet(
+    uint64 indexed destChainSelector, uint64 sequenceNumber, IRouter router, bool allowListEnabled
+  );
   event FeePaid(address indexed feeToken, uint256 feeValueJuels);
   event FeeTokenWithdrawn(address indexed feeAggregator, address indexed feeToken, uint256 amount);
   /// RMN depends on this event, if changing, please notify the RMN maintainers.
   event CCIPSendRequested(uint64 indexed destChainSelector, Internal.EVM2AnyRampMessage message);
+  event AllowListAdminSet(address indexed allowListAdmin);
+  event AllowListSendersAdded(uint64 indexed destChainSelector, address[] senders);
+  event AllowListSendersRemoved(uint64 indexed destChainSelector, address[] senders);
 
   /// @dev Struct that contains the static configuration
   /// RMN depends on this struct, if changing, please notify the RMN maintainers.
   // solhint-disable-next-line gas-struct-packing
   struct StaticConfig {
-    uint64 chainSelector; // ─────╮ Source chainSelector
-    address rmnProxy; // ─────────╯ Address of RMN proxy
-    address nonceManager; // Address of the nonce manager
+    uint64 chainSelector; // ─────╮ Source chain selector
+    address rmnProxy; // ─────────╯ RMN proxy address
+    address nonceManager; // Nonce manager address
     address tokenAdminRegistry; // Token admin registry address
   }
 
-  /// @dev Struct to contains the dynamic configuration
+  /// @dev Struct that contains the dynamic configuration
   // solhint-disable-next-line gas-struct-packing
   struct DynamicConfig {
-    address priceRegistry; // Price registry address
+    address feeQuoter; // FeeQuoter address
     address messageValidator; // Optional message validator to validate outbound messages (zero address = no validator)
     address feeAggregator; // Fee aggregator address
+    address allowListAdmin; // authorized admin to add or remove allowed senders
   }
 
   /// @dev Struct to hold the configs for a destination chain
+  /// @dev sequenceNumber, allowListEnabled, router will all be packed in 1 slot
   struct DestChainConfig {
-    // The last used sequence number. This is zero in the case where no messages has been sent yet.
+    // The last used sequence number. This is zero in the case where no messages have yet been sent.
     // 0 is not a valid sequence number for any real transaction.
-    uint64 sequenceNumber;
-    // This is the local router address that is allowed to send messages to the destination chain.
-    // This is NOT the receiving router address on the destination chain.
-    IRouter router;
+    uint64 sequenceNumber; // ──────╮ The last used sequence number
+    bool allowListEnabled; //       │ boolean indicator to specify if allowList check is enabled
+    IRouter router; // ─────────────╯ Local router address  that is allowed to send messages to the destination chain.
+    // This is the list of addresses allowed to send messages from onRamp
+    EnumerableSet.AddressSet allowedSendersList;
   }
 
   /// @dev Same as DestChainConfig but with the destChainSelector so that an array of these
@@ -79,6 +92,19 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
     IRouter router; // Source router address
   }
 
+  /// @dev Struct used to apply AllowList Senders for multiple destChainSelectors
+  /// @dev the senders in the AllowlistedSenders here is the user that sends the message
+  /// @dev the config restricts the chain to allow only allowedList of senders to send message from this chain to a destChainSelector
+  /// @dev destChainSelector, allowListEnabled will be packed in 1 slot
+  //solhint-disable gas-struct-packing
+  struct AllowListConfigArgs {
+    uint64 destChainSelector; // ─────────────╮ Destination chain selector
+      //                                      │ destChainSelector and allowListEnabled are packed in the same slot
+    bool allowListEnabled; // ────────────────╯ boolean indicator to specify if allowList check is enabled.
+    address[] addedAllowlistedSenders; // list of senders to be added to the allowedSendersList
+    address[] removedAllowlistedSenders; // list of senders to be removed from the allowedSendersList
+  }
+
   // STATIC CONFIG
   string public constant override typeAndVersion = "OnRamp 1.6.0-dev";
   /// @dev The chain ID of the source chain that this contract is deployed to
@@ -89,10 +115,9 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
   address internal immutable i_nonceManager;
   /// @dev The address of the token admin registry
   address internal immutable i_tokenAdminRegistry;
-  /// @dev the maximum number of nops that can be configured at the same time.
 
   // DYNAMIC CONFIG
-  /// @dev The config for the onRamp
+  /// @dev The dynamic config for the onRamp
   DynamicConfig internal s_dynamicConfig;
 
   /// @dev The destination chain specific configs
@@ -125,7 +150,7 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
 
   /// @notice Gets the next sequence number to be used in the onRamp
   /// @param destChainSelector The destination chain selector
-  /// @return the next sequence number to be used
+  /// @return nextSequenceNumber The next sequence number to be used
   function getExpectedNextSequenceNumber(uint64 destChainSelector) external view returns (uint64) {
     return s_destChainConfigs[destChainSelector].sequenceNumber + 1;
   }
@@ -142,6 +167,13 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
     // NOTE: assumes the message has already been validated through the getFee call
     // Validate message sender is set and allowed. Not validated in `getFee` since it is not user-driven.
     if (originalSender == address(0)) revert RouterMustSetOriginalSender();
+
+    if (destChainConfig.allowListEnabled) {
+      if (!destChainConfig.allowedSendersList.contains(originalSender)) {
+        revert SenderNotAllowed(originalSender);
+      }
+    }
+
     // Router address may be zero intentionally to pause.
     if (msg.sender != address(destChainConfig.router)) revert MustBeCalledByRouter();
 
@@ -154,8 +186,8 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
     }
 
     // Convert message fee to juels and retrieve converted args
-    (uint256 msgFeeJuels, bool isOutOfOrderExecution, bytes memory convertedExtraArgs) = IPriceRegistry(
-      s_dynamicConfig.priceRegistry
+    (uint256 msgFeeJuels, bool isOutOfOrderExecution, bytes memory convertedExtraArgs) = IFeeQuoter(
+      s_dynamicConfig.feeQuoter
     ).processMessageArgs(destChainSelector, message.feeToken, feeTokenAmount, message.extraArgs);
 
     emit FeePaid(message.feeToken, msgFeeJuels);
@@ -184,7 +216,7 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
       tokenAmounts: new Internal.RampTokenAmount[](message.tokenAmounts.length)
     });
 
-    // Lock the tokens as last step. TokenPools may not always be trusted.
+    // Lock / burn the tokens as last step. TokenPools may not always be trusted.
     // There should be no state changes after external call to TokenPools.
     for (uint256 i = 0; i < message.tokenAmounts.length; ++i) {
       newMessage.tokenAmounts[i] =
@@ -192,10 +224,14 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
     }
 
     // Validate pool return data after it is populated (view function - no state changes)
-    IPriceRegistry(s_dynamicConfig.priceRegistry).validatePoolReturnData(
+    bytes[] memory destExecDataPerToken = IFeeQuoter(s_dynamicConfig.feeQuoter).processPoolReturnData(
       destChainSelector, newMessage.tokenAmounts, message.tokenAmounts
     );
 
+    for (uint256 i = 0; i < newMessage.tokenAmounts.length; ++i) {
+      newMessage.tokenAmounts[i].destExecData = destExecDataPerToken[i];
+    }
+
     // Override extraArgs with latest version
     newMessage.extraArgs = convertedExtraArgs;
 
@@ -216,10 +252,10 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
 
   /// @notice Uses a pool to lock or burn a token
   /// @param tokenAndAmount Token address and amount to lock or burn
-  /// @param destChainSelector Target dest chain selector of the message
+  /// @param destChainSelector Target destination chain selector of the message
   /// @param receiver Message receiver
   /// @param originalSender Message sender
-  /// @return rampTokenAndAmount Ramp token and amount data
+  /// @return rampTokenAmount Ramp token and amount data
   function _lockOrBurnSingleToken(
     Client.EVMTokenAmount memory tokenAndAmount,
     uint64 destChainSelector,
@@ -246,13 +282,13 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
       })
     );
 
-    // NOTE: pool data validations are outsourced to the PriceRegistry to handle family-specific logic handling
-
+    // NOTE: pool data validations are outsourced to the FeeQuoter to handle family-specific logic handling
     return Internal.RampTokenAmount({
       sourcePoolAddress: abi.encode(sourcePool),
       destTokenAddress: poolReturnData.destTokenAddress,
       extraData: poolReturnData.destPoolData,
-      amount: tokenAndAmount.amount
+      amount: tokenAndAmount.amount,
+      destExecData: "" // This is set in the processPoolReturnData function
     });
   }
 
@@ -261,8 +297,8 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
   // ================================================================
 
   /// @notice Returns the static onRamp config.
-  /// @dev RMN depends on this function, if changing, please notify the RMN maintainers.
-  /// @return the configuration.
+  /// @dev RMN depends on this function, if modified, please notify the RMN maintainers.
+  /// @return staticConfig the static configuration.
   function getStaticConfig() external view returns (StaticConfig memory) {
     return StaticConfig({
       chainSelector: i_chainSelector,
@@ -273,7 +309,7 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
   }
 
   /// @notice Returns the dynamic onRamp config.
-  /// @return dynamicConfig the configuration.
+  /// @return dynamicConfig the dynamic configuration.
   function getDynamicConfig() external view returns (DynamicConfig memory dynamicConfig) {
     return s_dynamicConfig;
   }
@@ -293,7 +329,7 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
 
   /// @notice Internal version of setDynamicConfig to allow for reuse in the constructor.
   function _setDynamicConfig(DynamicConfig memory dynamicConfig) internal {
-    if (dynamicConfig.priceRegistry == address(0) || dynamicConfig.feeAggregator == address(0)) revert InvalidConfig();
+    if (dynamicConfig.feeQuoter == address(0) || dynamicConfig.feeAggregator == address(0)) revert InvalidConfig();
 
     s_dynamicConfig = dynamicConfig;
 
@@ -308,8 +344,8 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
     );
   }
 
-  /// @notice Updates the destination chain specific config.
-  /// @param destChainConfigArgs Array of source chain specific configs.
+  /// @notice Updates destination chains specific configs.
+  /// @param destChainConfigArgs Array of destination chain specific configs.
   function applyDestChainConfigUpdates(DestChainConfigArgs[] memory destChainConfigArgs) external onlyOwner {
     _applyDestChainConfigUpdates(destChainConfigArgs);
   }
@@ -324,13 +360,80 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
         revert InvalidDestChainConfig(destChainSelector);
       }
 
-      DestChainConfig memory newDestChainConfig = DestChainConfig({
-        sequenceNumber: s_destChainConfigs[destChainSelector].sequenceNumber,
-        router: destChainConfigArg.router
-      });
-      s_destChainConfigs[destChainSelector] = newDestChainConfig;
+      DestChainConfig storage destChainConfig = s_destChainConfigs[destChainSelector];
+      destChainConfig.router = destChainConfigArg.router;
+
+      emit DestChainConfigSet(
+        destChainSelector, destChainConfig.sequenceNumber, destChainConfigArg.router, destChainConfig.allowListEnabled
+      );
+    }
+  }
+
+  /// @notice get ChainConfig configured for the DestinationChainSelector
+  /// @param destChainSelector The destination chain selector
+  /// @return sequenceNumber The last used sequence number
+  /// @return allowListEnabled boolean indicator to specify if allowList check is enabled
+  /// @return router address of the router
+  function getDestChainConfig(
+    uint64 destChainSelector
+  ) public view returns (uint64 sequenceNumber, bool allowListEnabled, address router) {
+    DestChainConfig storage config = s_destChainConfigs[destChainSelector];
+    sequenceNumber = config.sequenceNumber;
+    allowListEnabled = config.allowListEnabled;
+    router = address(config.router);
+    return (sequenceNumber, allowListEnabled, router);
+  }
 
-      emit DestChainConfigSet(destChainSelector, newDestChainConfig);
+  /// @notice get allowedSenders List configured for the DestinationChainSelector
+  /// @param destChainSelector The destination chain selector
+  /// @return array of allowedList of Senders
+  function getAllowedSendersList(uint64 destChainSelector) public view returns (address[] memory) {
+    return s_destChainConfigs[destChainSelector].allowedSendersList.values();
+  }
+
+  // ================================================================
+  // │                          Allowlist                           │
+  // ================================================================
+
+  /// @notice Updates allowListConfig for Senders
+  /// @dev configuration used to set the list of senders who are authorized to send messages
+  /// @param allowListConfigArgsItems Array of AllowListConfigArguments where each item is for a destChainSelector
+  function applyAllowListUpdates(AllowListConfigArgs[] calldata allowListConfigArgsItems) external {
+    if (msg.sender != owner()) {
+      if (msg.sender != s_dynamicConfig.allowListAdmin) {
+        revert OnlyCallableByOwnerOrAllowlistAdmin();
+      }
+    }
+
+    for (uint256 i = 0; i < allowListConfigArgsItems.length; ++i) {
+      AllowListConfigArgs memory allowListConfigArgs = allowListConfigArgsItems[i];
+
+      DestChainConfig storage destChainConfig = s_destChainConfigs[allowListConfigArgs.destChainSelector];
+      destChainConfig.allowListEnabled = allowListConfigArgs.allowListEnabled;
+
+      if (allowListConfigArgs.allowListEnabled) {
+        for (uint256 j = 0; j < allowListConfigArgs.addedAllowlistedSenders.length; ++j) {
+          address toAdd = allowListConfigArgs.addedAllowlistedSenders[j];
+          if (toAdd == address(0)) {
+            revert InvalidAllowListRequest(allowListConfigArgs.destChainSelector);
+          }
+          destChainConfig.allowedSendersList.add(toAdd);
+        }
+
+        if (allowListConfigArgs.addedAllowlistedSenders.length > 0) {
+          emit AllowListSendersAdded(allowListConfigArgs.destChainSelector, allowListConfigArgs.addedAllowlistedSenders);
+        }
+      }
+
+      for (uint256 k = 0; k < allowListConfigArgs.removedAllowlistedSenders.length; ++k) {
+        destChainConfig.allowedSendersList.remove(allowListConfigArgs.removedAllowlistedSenders[k]);
+      }
+
+      if (allowListConfigArgs.removedAllowlistedSenders.length > 0) {
+        emit AllowListSendersRemoved(
+          allowListConfigArgs.destChainSelector, allowListConfigArgs.removedAllowlistedSenders
+        );
+      }
     }
   }
 
@@ -363,13 +466,13 @@ contract OnRamp is IEVM2AnyOnRampClient, ITypeAndVersion, OwnerIsCreator {
   ) external view returns (uint256 feeTokenAmount) {
     if (IRMN(i_rmnProxy).isCursed(bytes16(uint128(destChainSelector)))) revert CursedByRMN(destChainSelector);
 
-    return IPriceRegistry(s_dynamicConfig.priceRegistry).getValidatedFee(destChainSelector, message);
+    return IFeeQuoter(s_dynamicConfig.feeQuoter).getValidatedFee(destChainSelector, message);
   }
 
   /// @notice Withdraws the outstanding fee token balances to the fee aggregator.
   /// @dev This function can be permissionless as it only transfers accepted fee tokens to the fee aggregator which is a trusted address.
   function withdrawFeeTokens() external {
-    address[] memory feeTokens = IPriceRegistry(s_dynamicConfig.priceRegistry).getFeeTokens();
+    address[] memory feeTokens = IFeeQuoter(s_dynamicConfig.feeQuoter).getFeeTokens();
     address feeAggregator = s_dynamicConfig.feeAggregator;
 
     for (uint256 i = 0; i < feeTokens.length; ++i) {
diff --git a/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAbstract.sol b/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAbstract.sol
index a31d4fd219..99908c91d0 100644
--- a/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAbstract.sol
+++ b/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAbstract.sol
@@ -14,12 +14,9 @@ abstract contract BurnMintTokenPoolAbstract is TokenPool {
 
   /// @notice Burn the token in the pool
   /// @dev The _validateLockOrBurn check is an essential security check
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    external
-    virtual
-    override
-    returns (Pool.LockOrBurnOutV1 memory)
-  {
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) external virtual override returns (Pool.LockOrBurnOutV1 memory) {
     _validateLockOrBurn(lockOrBurnIn);
 
     _burn(lockOrBurnIn.amount);
@@ -31,12 +28,9 @@ abstract contract BurnMintTokenPoolAbstract is TokenPool {
 
   /// @notice Mint tokens from the pool to the recipient
   /// @dev The _validateReleaseOrMint check is an essential security check
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    external
-    virtual
-    override
-    returns (Pool.ReleaseOrMintOutV1 memory)
-  {
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) external virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
     _validateReleaseOrMint(releaseOrMintIn);
 
     // Mint to the receiver
diff --git a/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAndProxy.sol b/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAndProxy.sol
index 6ca8b7d6a0..6e3fb0f479 100644
--- a/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAndProxy.sol
+++ b/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAndProxy.sol
@@ -19,12 +19,9 @@ contract BurnMintTokenPoolAndProxy is ITypeAndVersion, LegacyPoolWrapper {
 
   /// @notice Burn the token in the pool
   /// @dev The _validateLockOrBurn check is an essential security check
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    external
-    virtual
-    override
-    returns (Pool.LockOrBurnOutV1 memory)
-  {
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) external virtual override returns (Pool.LockOrBurnOutV1 memory) {
     _validateLockOrBurn(lockOrBurnIn);
 
     if (!_hasLegacyPool()) {
@@ -40,12 +37,9 @@ contract BurnMintTokenPoolAndProxy is ITypeAndVersion, LegacyPoolWrapper {
 
   /// @notice Mint tokens from the pool to the recipient
   /// @dev The _validateReleaseOrMint check is an essential security check
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    external
-    virtual
-    override
-    returns (Pool.ReleaseOrMintOutV1 memory)
-  {
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) external virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
     _validateReleaseOrMint(releaseOrMintIn);
 
     if (!_hasLegacyPool()) {
diff --git a/contracts/src/v0.8/ccip/pools/BurnWithFromMintTokenPoolAndProxy.sol b/contracts/src/v0.8/ccip/pools/BurnWithFromMintTokenPoolAndProxy.sol
index 7890d85824..324fd484a7 100644
--- a/contracts/src/v0.8/ccip/pools/BurnWithFromMintTokenPoolAndProxy.sol
+++ b/contracts/src/v0.8/ccip/pools/BurnWithFromMintTokenPoolAndProxy.sol
@@ -27,12 +27,9 @@ contract BurnWithFromMintTokenPoolAndProxy is ITypeAndVersion, LegacyPoolWrapper
 
   /// @notice Burn the token in the pool
   /// @dev The _validateLockOrBurn check is an essential security check
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    external
-    virtual
-    override
-    returns (Pool.LockOrBurnOutV1 memory)
-  {
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) external virtual override returns (Pool.LockOrBurnOutV1 memory) {
     _validateLockOrBurn(lockOrBurnIn);
 
     if (!_hasLegacyPool()) {
@@ -48,12 +45,9 @@ contract BurnWithFromMintTokenPoolAndProxy is ITypeAndVersion, LegacyPoolWrapper
 
   /// @notice Mint tokens from the pool to the recipient
   /// @dev The _validateReleaseOrMint check is an essential security check
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    external
-    virtual
-    override
-    returns (Pool.ReleaseOrMintOutV1 memory)
-  {
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) external virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
     _validateReleaseOrMint(releaseOrMintIn);
 
     if (!_hasLegacyPool()) {
diff --git a/contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol b/contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol
index bc451f435a..3a4a4aef6d 100644
--- a/contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol
+++ b/contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol
@@ -44,12 +44,9 @@ contract LockReleaseTokenPool is TokenPool, ILiquidityContainer, ITypeAndVersion
 
   /// @notice Locks the token in the pool
   /// @dev The _validateLockOrBurn check is an essential security check
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    external
-    virtual
-    override
-    returns (Pool.LockOrBurnOutV1 memory)
-  {
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) external virtual override returns (Pool.LockOrBurnOutV1 memory) {
     _validateLockOrBurn(lockOrBurnIn);
 
     emit Locked(msg.sender, lockOrBurnIn.amount);
@@ -59,12 +56,9 @@ contract LockReleaseTokenPool is TokenPool, ILiquidityContainer, ITypeAndVersion
 
   /// @notice Release tokens from the pool to the recipient
   /// @dev The _validateReleaseOrMint check is an essential security check
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    external
-    virtual
-    override
-    returns (Pool.ReleaseOrMintOutV1 memory)
-  {
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) external virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
     _validateReleaseOrMint(releaseOrMintIn);
 
     // Release to the recipient
diff --git a/contracts/src/v0.8/ccip/pools/LockReleaseTokenPoolAndProxy.sol b/contracts/src/v0.8/ccip/pools/LockReleaseTokenPoolAndProxy.sol
index af79e821b8..e8c39127de 100644
--- a/contracts/src/v0.8/ccip/pools/LockReleaseTokenPoolAndProxy.sol
+++ b/contracts/src/v0.8/ccip/pools/LockReleaseTokenPoolAndProxy.sol
@@ -42,12 +42,9 @@ contract LockReleaseTokenPoolAndProxy is LegacyPoolWrapper, ILiquidityContainer,
 
   /// @notice Locks the token in the pool
   /// @dev The _validateLockOrBurn check is an essential security check
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    external
-    virtual
-    override
-    returns (Pool.LockOrBurnOutV1 memory)
-  {
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) external virtual override returns (Pool.LockOrBurnOutV1 memory) {
     _validateLockOrBurn(lockOrBurnIn);
 
     if (_hasLegacyPool()) {
@@ -61,12 +58,9 @@ contract LockReleaseTokenPoolAndProxy is LegacyPoolWrapper, ILiquidityContainer,
 
   /// @notice Release tokens from the pool to the recipient
   /// @dev The _validateReleaseOrMint check is an essential security check
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    external
-    virtual
-    override
-    returns (Pool.ReleaseOrMintOutV1 memory)
-  {
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) external virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
     _validateReleaseOrMint(releaseOrMintIn);
 
     if (!_hasLegacyPool()) {
diff --git a/contracts/src/v0.8/ccip/pools/TokenPool.sol b/contracts/src/v0.8/ccip/pools/TokenPool.sol
index 0b87b6dfcb..b12a12ca7a 100644
--- a/contracts/src/v0.8/ccip/pools/TokenPool.sol
+++ b/contracts/src/v0.8/ccip/pools/TokenPool.sol
@@ -325,21 +325,17 @@ abstract contract TokenPool is IPoolV1, OwnerIsCreator {
 
   /// @notice Gets the token bucket with its values for the block it was requested at.
   /// @return The token bucket.
-  function getCurrentOutboundRateLimiterState(uint64 remoteChainSelector)
-    external
-    view
-    returns (RateLimiter.TokenBucket memory)
-  {
+  function getCurrentOutboundRateLimiterState(
+    uint64 remoteChainSelector
+  ) external view returns (RateLimiter.TokenBucket memory) {
     return s_remoteChainConfigs[remoteChainSelector].outboundRateLimiterConfig._currentTokenBucketState();
   }
 
   /// @notice Gets the token bucket with its values for the block it was requested at.
   /// @return The token bucket.
-  function getCurrentInboundRateLimiterState(uint64 remoteChainSelector)
-    external
-    view
-    returns (RateLimiter.TokenBucket memory)
-  {
+  function getCurrentInboundRateLimiterState(
+    uint64 remoteChainSelector
+  ) external view returns (RateLimiter.TokenBucket memory) {
     return s_remoteChainConfigs[remoteChainSelector].inboundRateLimiterConfig._currentTokenBucketState();
   }
 
diff --git a/contracts/src/v0.8/ccip/pools/USDC/HybridLockReleaseUSDCTokenPool.sol b/contracts/src/v0.8/ccip/pools/USDC/HybridLockReleaseUSDCTokenPool.sol
new file mode 100644
index 0000000000..49cdeafcbc
--- /dev/null
+++ b/contracts/src/v0.8/ccip/pools/USDC/HybridLockReleaseUSDCTokenPool.sol
@@ -0,0 +1,210 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity 0.8.24;
+
+import {ILiquidityContainer} from "../../../liquiditymanager/interfaces/ILiquidityContainer.sol";
+import {ITokenMessenger} from "../USDC/ITokenMessenger.sol";
+
+import {Pool} from "../../libraries/Pool.sol";
+import {TokenPool} from "../TokenPool.sol";
+import {USDCTokenPool} from "../USDC/USDCTokenPool.sol";
+import {USDCBridgeMigrator} from "./USDCBridgeMigrator.sol";
+
+import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/structs/EnumerableSet.sol";
+
+/// @notice A token pool for USDC which uses CCTP for supported chains and Lock/Release for all others
+/// @dev The functionality from LockReleaseTokenPool.sol has been duplicated due to lack of compiler support for shared
+/// constructors between parents
+/// @dev The primary token mechanism in this pool is Burn/Mint with CCTP, with Lock/Release as the
+/// secondary, opt in mechanism for chains not currently supporting CCTP.
+contract HybridLockReleaseUSDCTokenPool is USDCTokenPool, USDCBridgeMigrator {
+  using SafeERC20 for IERC20;
+  using EnumerableSet for EnumerableSet.UintSet;
+
+  event LiquidityTransferred(address indexed from, uint64 indexed remoteChainSelector, uint256 amount);
+  event LiquidityProviderSet(
+    address indexed oldProvider, address indexed newProvider, uint64 indexed remoteChainSelector
+  );
+
+  event LockReleaseEnabled(uint64 indexed remoteChainSelector);
+  event LockReleaseDisabled(uint64 indexed remoteChainSelector);
+
+  error LanePausedForCCTPMigration(uint64 remoteChainSelector);
+  error TokenLockingNotAllowedAfterMigration(uint64 remoteChainSelector);
+
+  /// @notice The address of the liquidity provider for a specific chain.
+  /// External liquidity is not required when there is one canonical token deployed to a chain,
+  /// and CCIP is facilitating mint/burn on all the other chains, in which case the invariant
+  /// balanceOf(pool) on home chain >= sum(totalSupply(mint/burn "wrapped" token) on all remote chains) should always hold
+  mapping(uint64 remoteChainSelector => address liquidityProvider) internal s_liquidityProvider;
+
+  constructor(
+    ITokenMessenger tokenMessenger,
+    IERC20 token,
+    address[] memory allowlist,
+    address rmnProxy,
+    address router
+  ) USDCTokenPool(tokenMessenger, token, allowlist, rmnProxy, router) USDCBridgeMigrator(address(token), router) {}
+
+  // ================================================================
+  // │                   Incoming/Outgoing Mechanisms               |
+  // ================================================================
+
+  /// @notice Locks the token in the pool
+  /// @dev The _validateLockOrBurn check is an essential security check
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) public virtual override returns (Pool.LockOrBurnOutV1 memory) {
+    // // If the alternative mechanism (L/R) for chains which have it enabled
+    if (!shouldUseLockRelease(lockOrBurnIn.remoteChainSelector)) {
+      return super.lockOrBurn(lockOrBurnIn);
+    }
+
+    // Circle requires a supply-lock to prevent outgoing messages once the migration process begins.
+    // This prevents new outgoing messages once the migration has begun to ensure any the procedure runs as expected
+    if (s_proposedUSDCMigrationChain == lockOrBurnIn.remoteChainSelector) {
+      revert LanePausedForCCTPMigration(s_proposedUSDCMigrationChain);
+    }
+
+    return _lockReleaseOutgoingMessage(lockOrBurnIn);
+  }
+
+  /// @notice Release tokens from the pool to the recipient
+  /// @dev The _validateReleaseOrMint check is an essential security check
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) public virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
+    if (!shouldUseLockRelease(releaseOrMintIn.remoteChainSelector)) {
+      return super.releaseOrMint(releaseOrMintIn);
+    }
+    return _lockReleaseIncomingMessage(releaseOrMintIn);
+  }
+
+  /// @notice Contains the alternative mechanism for incoming tokens, in this implementation is "Release" incoming tokens
+  function _lockReleaseIncomingMessage(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) internal virtual returns (Pool.ReleaseOrMintOutV1 memory) {
+    _validateReleaseOrMint(releaseOrMintIn);
+
+    // Decrease internal tracking of locked tokens to ensure accurate accounting for burnLockedUSDC() migration
+    s_lockedTokensByChainSelector[releaseOrMintIn.remoteChainSelector] -= releaseOrMintIn.amount;
+
+    // Release to the offRamp, which forwards it to the recipient
+    getToken().safeTransfer(releaseOrMintIn.receiver, releaseOrMintIn.amount);
+
+    emit Released(msg.sender, releaseOrMintIn.receiver, releaseOrMintIn.amount);
+
+    return Pool.ReleaseOrMintOutV1({destinationAmount: releaseOrMintIn.amount});
+  }
+
+  /// @notice Contains the alternative mechanism, in this implementation is "Lock" on outgoing tokens
+  function _lockReleaseOutgoingMessage(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) internal virtual returns (Pool.LockOrBurnOutV1 memory) {
+    _validateLockOrBurn(lockOrBurnIn);
+
+    // Increase internal accounting of locked tokens for burnLockedUSDC() migration
+    s_lockedTokensByChainSelector[lockOrBurnIn.remoteChainSelector] += lockOrBurnIn.amount;
+
+    emit Locked(msg.sender, lockOrBurnIn.amount);
+
+    return Pool.LockOrBurnOutV1({destTokenAddress: getRemoteToken(lockOrBurnIn.remoteChainSelector), destPoolData: ""});
+  }
+
+  // ================================================================
+  // │                   Liquidity Management                       |
+  // ================================================================
+
+  /// @notice Gets LiquidityManager, can be address(0) if none is configured.
+  /// @return The current liquidity manager for the given chain selector
+  function getLiquidityProvider(uint64 remoteChainSelector) external view returns (address) {
+    return s_liquidityProvider[remoteChainSelector];
+  }
+
+  /// @notice Sets the LiquidityManager address.
+  /// @dev Only callable by the owner.
+  function setLiquidityProvider(uint64 remoteChainSelector, address liquidityProvider) external onlyOwner {
+    address oldProvider = s_liquidityProvider[remoteChainSelector];
+
+    s_liquidityProvider[remoteChainSelector] = liquidityProvider;
+
+    emit LiquidityProviderSet(oldProvider, liquidityProvider, remoteChainSelector);
+  }
+
+  /// @notice Adds liquidity to the pool for a specific chain. The tokens should be approved first.
+  /// @dev Liquidity is expected to be added on a per chain basis. Parties are expected to provide liquidity for their
+  /// own chain which implements non canonical USDC and liquidity is not shared across lanes.
+  /// @param amount The amount of liquidity to provide.
+  /// @param remoteChainSelector The chain for which liquidity is provided to. Necessary to ensure there's accurate
+  /// parity between locked USDC in this contract and the circulating supply on the remote chain
+  function provideLiquidity(uint64 remoteChainSelector, uint256 amount) external {
+    if (s_liquidityProvider[remoteChainSelector] != msg.sender) revert TokenPool.Unauthorized(msg.sender);
+
+    s_lockedTokensByChainSelector[remoteChainSelector] += amount;
+
+    i_token.safeTransferFrom(msg.sender, address(this), amount);
+
+    emit ILiquidityContainer.LiquidityAdded(msg.sender, amount);
+  }
+
+  /// @notice Removed liquidity to the pool. The tokens will be sent to msg.sender.
+  /// @param remoteChainSelector The chain where liquidity is being released.
+  /// @param amount The amount of liquidity to remove.
+  /// @dev The function should only be called if non canonical USDC on the remote chain has been burned and is not being
+  /// withdrawn on this chain, otherwise a mismatch may occur between locked token balance and remote circulating supply
+  /// which may block a potential future migration of the chain to CCTP.
+  function withdrawLiquidity(uint64 remoteChainSelector, uint256 amount) external {
+    if (s_liquidityProvider[remoteChainSelector] != msg.sender) revert TokenPool.Unauthorized(msg.sender);
+
+    s_lockedTokensByChainSelector[remoteChainSelector] -= amount;
+
+    i_token.safeTransfer(msg.sender, amount);
+    emit ILiquidityContainer.LiquidityRemoved(msg.sender, amount);
+  }
+
+  /// @notice This function can be used to transfer liquidity from an older version of the pool to this pool. To do so
+  /// this pool will have to be set as the liquidity provider in the older version of the pool. This allows it to transfer the
+  /// funds in the old pool to the new pool.
+  /// @dev When upgrading a LockRelease pool, this function can be called at the same time as the pool is changed in the
+  /// TokenAdminRegistry. This allows for a smooth transition of both liquidity and transactions to the new pool.
+  /// Alternatively, when no multicall is available, a portion of the funds can be transferred to the new pool before
+  /// changing which pool CCIP uses, to ensure both pools can operate. Then the pool should be changed in the
+  /// TokenAdminRegistry, which will activate the new pool. All new transactions will use the new pool and its
+  /// liquidity. Finally, the remaining liquidity can be transferred to the new pool using this function one more time.
+  /// @param from The address of the old pool.
+  /// @param amount The amount of liquidity to transfer.
+  function transferLiquidity(address from, uint64 remoteChainSelector, uint256 amount) external onlyOwner {
+    HybridLockReleaseUSDCTokenPool(from).withdrawLiquidity(remoteChainSelector, amount);
+
+    s_lockedTokensByChainSelector[remoteChainSelector] += amount;
+
+    emit LiquidityTransferred(from, remoteChainSelector, amount);
+  }
+
+  // ================================================================
+  // │                   Alt Mechanism Logic                        |
+  // ================================================================
+
+  /// @notice Return whether a lane should use the alternative L/R mechanism in the token pool.
+  /// @param remoteChainSelector the remote chain the lane is interacting with
+  /// @return bool Return true if the alternative L/R mechanism should be used
+  function shouldUseLockRelease(uint64 remoteChainSelector) public view virtual returns (bool) {
+    return s_shouldUseLockRelease[remoteChainSelector];
+  }
+
+  /// @notice Updates Updates designations for chains on whether to use primary or alt mechanism on CCIP messages
+  /// @param removes A list of chain selectors to disable Lock-Release, and enforce BM
+  /// @param adds A list of chain selectors to enable LR instead of BM
+  function updateChainSelectorMechanisms(uint64[] calldata removes, uint64[] calldata adds) external onlyOwner {
+    for (uint256 i = 0; i < removes.length; ++i) {
+      delete s_shouldUseLockRelease[removes[i]];
+      emit LockReleaseDisabled(removes[i]);
+    }
+
+    for (uint256 i = 0; i < adds.length; ++i) {
+      s_shouldUseLockRelease[adds[i]] = true;
+      emit LockReleaseEnabled(adds[i]);
+    }
+  }
+}
diff --git a/contracts/src/v0.8/ccip/pools/USDC/USDCBridgeMigrator.sol b/contracts/src/v0.8/ccip/pools/USDC/USDCBridgeMigrator.sol
new file mode 100644
index 0000000000..827787f4cf
--- /dev/null
+++ b/contracts/src/v0.8/ccip/pools/USDC/USDCBridgeMigrator.sol
@@ -0,0 +1,119 @@
+pragma solidity ^0.8.24;
+
+import {OwnerIsCreator} from "../../../shared/access/OwnerIsCreator.sol";
+import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol";
+
+import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/structs/EnumerableSet.sol";
+
+import {Router} from "../../Router.sol";
+
+/// @notice Allows migration of a lane in a token pool from Lock/Release to CCTP supported Burn/Mint. Contract
+/// functionality is based on hard requirements defined by Circle to allow future CCTP compatibility
+/// @dev Once a migration for a lane has occured, it can never be reversed, and CCTP will be the mechanism forever. This makes the assumption that Circle will continue to support that lane indefinitely.
+abstract contract USDCBridgeMigrator is OwnerIsCreator {
+  using EnumerableSet for EnumerableSet.UintSet;
+
+  event CCTPMigrationProposed(uint64 remoteChainSelector);
+  event CCTPMigrationExecuted(uint64 remoteChainSelector, uint256 USDCBurned);
+  event CCTPMigrationCancelled(uint64 existingProposalSelector);
+  event CircleMigratorAddressSet(address migratorAddress);
+
+  error onlyCircle();
+  error ExistingMigrationProposal();
+  error NoExistingMigrationProposal();
+  error NoMigrationProposalPending();
+  error InvalidChainSelector(uint64 remoteChainSelector);
+
+  IBurnMintERC20 internal immutable i_USDC;
+  Router internal immutable i_router;
+
+  address internal s_circleUSDCMigrator;
+  uint64 internal s_proposedUSDCMigrationChain;
+
+  mapping(uint64 chainSelector => uint256 lockedBalance) internal s_lockedTokensByChainSelector;
+
+  mapping(uint64 chainSelector => bool shouldUseLockRelease) internal s_shouldUseLockRelease;
+
+  constructor(address token, address router) {
+    i_USDC = IBurnMintERC20(token);
+    i_router = Router(router);
+  }
+
+  /// @notice Burn USDC locked for a specific lane so that destination USDC can be converted from
+  /// non-canonical to canonical USDC.
+  /// @dev This function can only be called by an address specified by the owner to be controlled by circle
+  /// @dev proposeCCTPMigration must be called first on an approved lane to execute properly.
+  /// @dev This function signature should NEVER be overwritten, otherwise it will be unable to be called by
+  /// circle to properly migrate USDC over to CCTP.
+  function burnLockedUSDC() public {
+    if (msg.sender != s_circleUSDCMigrator) revert onlyCircle();
+    if (s_proposedUSDCMigrationChain == 0) revert ExistingMigrationProposal();
+
+    uint64 burnChainSelector = s_proposedUSDCMigrationChain;
+    uint256 tokensToBurn = s_lockedTokensByChainSelector[burnChainSelector];
+
+    // Even though USDC is a trusted call, ensure CEI by updating state first
+    delete s_lockedTokensByChainSelector[burnChainSelector];
+    delete s_proposedUSDCMigrationChain;
+
+    // This should only be called after this contract has been granted a "zero allowance minter role" on USDC by Circle,
+    // otherwise the call will revert. Executing this burn will functionally convert all USDC on the destination chain
+    // to canonical USDC by removing the canonical USDC backing it from circulation.
+    i_USDC.burn(tokensToBurn);
+
+    // Disable L/R automatically on burned chain and enable CCTP
+    delete s_shouldUseLockRelease[burnChainSelector];
+
+    emit CCTPMigrationExecuted(burnChainSelector, tokensToBurn);
+  }
+
+  /// @notice Propose a destination chain to migrate from lock/release mechanism to CCTP enabled burn/mint
+  /// through a Circle controlled burn.
+  /// @param remoteChainSelector the CCIP specific selector for the remote chain currently using a
+  /// non-canonical form of USDC which they wish to update to canonical. Function will revert if the chain
+  /// selector is zero, or if a migration has already occured for the specified selector.
+  /// @dev This function can only be called by the owner
+  function proposeCCTPMigration(uint64 remoteChainSelector) external onlyOwner {
+    // Prevent overwriting existing migration proposals until the current one is finished
+    if (s_proposedUSDCMigrationChain != 0) revert ExistingMigrationProposal();
+
+    s_proposedUSDCMigrationChain = remoteChainSelector;
+
+    emit CCTPMigrationProposed(remoteChainSelector);
+  }
+
+  /// @notice Cancel an existing proposal to migrate a lane to CCTP.
+  function cancelExistingCCTPMigrationProposal() external onlyOwner {
+    if (s_proposedUSDCMigrationChain == 0) revert NoExistingMigrationProposal();
+
+    uint64 currentProposalChainSelector = s_proposedUSDCMigrationChain;
+    delete s_proposedUSDCMigrationChain;
+
+    emit CCTPMigrationCancelled(currentProposalChainSelector);
+  }
+
+  /// @notice retrieve the chain selector for an ongoing CCTP migration in progress.
+  /// @return uint64 the chain selector of the lane to be migrated. Will be zero if no proposal currently
+  /// exists
+  function getCurrentProposedCCTPChainMigration() public view returns (uint64) {
+    return s_proposedUSDCMigrationChain;
+  }
+
+  /// @notice Set the address of the circle-controlled wallet which will execute a CCTP lane migration
+  /// @dev The function should only be invoked once the address has been confirmed by Circle prior to
+  /// chain expansion.
+  function setCircleMigratorAddress(address migrator) external onlyOwner {
+    s_circleUSDCMigrator = migrator;
+
+    emit CircleMigratorAddressSet(migrator);
+  }
+
+  /// @notice Retrieve the amount of canonical USDC locked into this lane and minted on the destination
+  /// @param remoteChainSelector the CCIP specific destination chain implementing a mintable and
+  /// non-canonical form of USDC at present.
+  /// @return uint256 the amount of USDC locked into the specified lane. If non-zero, the number
+  /// should match the current circulating supply of USDC on the destination chain
+  function getLockedTokensForChain(uint64 remoteChainSelector) public view returns (uint256) {
+    return s_lockedTokensByChainSelector[remoteChainSelector];
+  }
+}
diff --git a/contracts/src/v0.8/ccip/pools/USDC/USDCTokenPool.sol b/contracts/src/v0.8/ccip/pools/USDC/USDCTokenPool.sol
index e58b6374db..56ab40c9b5 100644
--- a/contracts/src/v0.8/ccip/pools/USDC/USDCTokenPool.sol
+++ b/contracts/src/v0.8/ccip/pools/USDC/USDCTokenPool.sol
@@ -96,12 +96,9 @@ contract USDCTokenPool is TokenPool, ITypeAndVersion {
   /// @notice Burn the token in the pool
   /// @dev emits ITokenMessenger.DepositForBurn
   /// @dev Assumes caller has validated destinationReceiver
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    public
-    virtual
-    override
-    returns (Pool.LockOrBurnOutV1 memory)
-  {
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) public virtual override returns (Pool.LockOrBurnOutV1 memory) {
     _validateLockOrBurn(lockOrBurnIn);
 
     Domain memory domain = s_chainToDomain[lockOrBurnIn.remoteChainSelector];
@@ -138,12 +135,9 @@ contract USDCTokenPool is TokenPool, ITypeAndVersion {
   /// for that message, including its (nonce, sourceDomain). This way, the only
   /// non-reverting offchainTokenData that can be supplied is a valid attestation for the
   /// specific message that was sent on source.
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    public
-    virtual
-    override
-    returns (Pool.ReleaseOrMintOutV1 memory)
-  {
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) public virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
     _validateReleaseOrMint(releaseOrMintIn);
     SourceTokenDataPayload memory sourceTokenDataPayload =
       abi.decode(releaseOrMintIn.sourcePoolData, (SourceTokenDataPayload));
diff --git a/contracts/src/v0.8/ccip/test/NonceManager.t.sol b/contracts/src/v0.8/ccip/test/NonceManager.t.sol
index 3811f0d3c6..69afc7104e 100644
--- a/contracts/src/v0.8/ccip/test/NonceManager.t.sol
+++ b/contracts/src/v0.8/ccip/test/NonceManager.t.sol
@@ -236,7 +236,7 @@ contract NonceManager_OnRampUpgrade is OnRampSetup {
         destDataAvailabilityOverheadGas: DEST_DATA_AVAILABILITY_OVERHEAD_GAS,
         destGasPerDataAvailabilityByte: DEST_GAS_PER_DATA_AVAILABILITY_BYTE,
         destDataAvailabilityMultiplierBps: DEST_GAS_DATA_AVAILABILITY_MULTIPLIER_BPS,
-        priceRegistry: address(s_priceRegistry),
+        priceRegistry: address(s_feeQuoter),
         maxDataBytes: MAX_DATA_SIZE,
         maxPerMsgGasLimit: MAX_GAS_LIMIT,
         defaultTokenFeeUSDCents: DEFAULT_TOKEN_FEE_USD_CENTS,
@@ -395,6 +395,7 @@ contract NonceManager_OffRampUpgrade is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -426,6 +427,7 @@ contract NonceManager_OffRampUpgrade is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_3,
       messagesChain3[0].header.sequenceNumber,
       messagesChain3[0].header.messageId,
+      Internal._hash(messagesChain3[0], ON_RAMP_ADDRESS_3),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -507,6 +509,7 @@ contract NonceManager_OffRampUpgrade is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messagesMultiRamp[0].header.sequenceNumber,
       messagesMultiRamp[0].header.messageId,
+      Internal._hash(messagesMultiRamp[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -527,6 +530,7 @@ contract NonceManager_OffRampUpgrade is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messagesMultiRamp[0].header.sequenceNumber,
       messagesMultiRamp[0].header.messageId,
+      Internal._hash(messagesMultiRamp[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -561,6 +565,7 @@ contract NonceManager_OffRampUpgrade is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messagesMultiRamp[0].header.sequenceNumber,
       messagesMultiRamp[0].header.messageId,
+      Internal._hash(messagesMultiRamp[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -611,17 +616,16 @@ contract NonceManager_OffRampUpgrade is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
     assertEq(startNonce + 2, s_inboundNonceManager.getInboundNonce(SOURCE_CHAIN_SELECTOR_1, messages[0].sender));
   }
 
-  function _generateSingleLaneRampReportFromMessages(Internal.EVM2EVMMessage[] memory messages)
-    internal
-    pure
-    returns (Internal.ExecutionReport memory)
-  {
+  function _generateSingleLaneRampReportFromMessages(
+    Internal.EVM2EVMMessage[] memory messages
+  ) internal pure returns (Internal.ExecutionReport memory) {
     bytes[][] memory offchainTokenData = new bytes[][](messages.length);
 
     for (uint256 i = 0; i < messages.length; ++i) {
diff --git a/contracts/src/v0.8/ccip/test/attacks/onRamp/ReentrantMaliciousTokenPool.sol b/contracts/src/v0.8/ccip/test/attacks/onRamp/ReentrantMaliciousTokenPool.sol
index 17c13a8148..5b6b367984 100644
--- a/contracts/src/v0.8/ccip/test/attacks/onRamp/ReentrantMaliciousTokenPool.sol
+++ b/contracts/src/v0.8/ccip/test/attacks/onRamp/ReentrantMaliciousTokenPool.sol
@@ -22,11 +22,9 @@ contract ReentrantMaliciousTokenPool is TokenPool {
   }
 
   /// @dev Calls into Facade to reenter Router exactly 1 time
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    external
-    override
-    returns (Pool.LockOrBurnOutV1 memory)
-  {
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) external override returns (Pool.LockOrBurnOutV1 memory) {
     if (s_attacked) {
       return
         Pool.LockOrBurnOutV1({destTokenAddress: getRemoteToken(lockOrBurnIn.remoteChainSelector), destPoolData: ""});
@@ -39,12 +37,9 @@ contract ReentrantMaliciousTokenPool is TokenPool {
     return Pool.LockOrBurnOutV1({destTokenAddress: getRemoteToken(lockOrBurnIn.remoteChainSelector), destPoolData: ""});
   }
 
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    external
-    pure
-    override
-    returns (Pool.ReleaseOrMintOutV1 memory)
-  {
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) external pure override returns (Pool.ReleaseOrMintOutV1 memory) {
     return Pool.ReleaseOrMintOutV1({destinationAmount: releaseOrMintIn.amount});
   }
 }
diff --git a/contracts/src/v0.8/ccip/test/capability/CCIPConfig.t.sol b/contracts/src/v0.8/ccip/test/capability/CCIPConfig.t.sol
index 2ac30b355a..ca7f2114a6 100644
--- a/contracts/src/v0.8/ccip/test/capability/CCIPConfig.t.sol
+++ b/contracts/src/v0.8/ccip/test/capability/CCIPConfig.t.sol
@@ -63,10 +63,9 @@ contract CCIPConfigSetup is Test {
     if (i < right) _sort(arr, i, right);
   }
 
-  function _addChainConfig(uint256 numNodes)
-    internal
-    returns (bytes32[] memory p2pIds, bytes[] memory signers, bytes[] memory transmitters)
-  {
+  function _addChainConfig(
+    uint256 numNodes
+  ) internal returns (bytes32[] memory p2pIds, bytes[] memory signers, bytes[] memory transmitters) {
     p2pIds = _makeBytes32Array(numNodes, 0);
     _sort(p2pIds, 0, int256(numNodes - 1));
     signers = _makeBytesArray(numNodes, 10);
diff --git a/contracts/src/v0.8/ccip/test/commitStore/CommitStore.t.sol b/contracts/src/v0.8/ccip/test/commitStore/CommitStore.t.sol
index 7ea64c9f89..0976ab96c5 100644
--- a/contracts/src/v0.8/ccip/test/commitStore/CommitStore.t.sol
+++ b/contracts/src/v0.8/ccip/test/commitStore/CommitStore.t.sol
@@ -6,19 +6,19 @@ import {IRMN} from "../../interfaces/IRMN.sol";
 
 import {AuthorizedCallers} from "../../../shared/access/AuthorizedCallers.sol";
 import {CommitStore} from "../../CommitStore.sol";
-import {PriceRegistry} from "../../PriceRegistry.sol";
+import {FeeQuoter} from "../../FeeQuoter.sol";
 import {RMN} from "../../RMN.sol";
 import {MerkleMultiProof} from "../../libraries/MerkleMultiProof.sol";
 import {OCR2Abstract} from "../../ocr/OCR2Abstract.sol";
+import {FeeQuoterSetup} from "../feeQuoter/FeeQuoterSetup.t.sol";
 import {CommitStoreHelper} from "../helpers/CommitStoreHelper.sol";
 import {OCR2BaseSetup} from "../ocr/OCR2Base.t.sol";
-import {PriceRegistrySetup} from "../priceRegistry/PriceRegistrySetup.t.sol";
 
-contract CommitStoreSetup is PriceRegistrySetup, OCR2BaseSetup {
+contract CommitStoreSetup is FeeQuoterSetup, OCR2BaseSetup {
   CommitStoreHelper internal s_commitStore;
 
-  function setUp() public virtual override(PriceRegistrySetup, OCR2BaseSetup) {
-    PriceRegistrySetup.setUp();
+  function setUp() public virtual override(FeeQuoterSetup, OCR2BaseSetup) {
+    FeeQuoterSetup.setUp();
     OCR2BaseSetup.setUp();
 
     s_commitStore = new CommitStoreHelper(
@@ -29,29 +29,28 @@ contract CommitStoreSetup is PriceRegistrySetup, OCR2BaseSetup {
         rmnProxy: address(s_mockRMN)
       })
     );
-    CommitStore.DynamicConfig memory dynamicConfig =
-      CommitStore.DynamicConfig({priceRegistry: address(s_priceRegistry)});
+    CommitStore.DynamicConfig memory dynamicConfig = CommitStore.DynamicConfig({priceRegistry: address(s_feeQuoter)});
     s_commitStore.setOCR2Config(
       s_valid_signers, s_valid_transmitters, s_f, abi.encode(dynamicConfig), s_offchainConfigVersion, abi.encode("")
     );
 
     address[] memory priceUpdaters = new address[](1);
     priceUpdaters[0] = address(s_commitStore);
-    s_priceRegistry.applyAuthorizedCallerUpdates(
+    s_feeQuoter.applyAuthorizedCallerUpdates(
       AuthorizedCallers.AuthorizedCallerArgs({addedCallers: priceUpdaters, removedCallers: new address[](0)})
     );
   }
 }
 
-contract CommitStoreRealRMNSetup is PriceRegistrySetup, OCR2BaseSetup {
+contract CommitStoreRealRMNSetup is FeeQuoterSetup, OCR2BaseSetup {
   CommitStoreHelper internal s_commitStore;
 
   RMN internal s_rmn;
 
   address internal constant BLESS_VOTE_ADDR = address(8888);
 
-  function setUp() public virtual override(PriceRegistrySetup, OCR2BaseSetup) {
-    PriceRegistrySetup.setUp();
+  function setUp() public virtual override(FeeQuoterSetup, OCR2BaseSetup) {
+    FeeQuoterSetup.setUp();
     OCR2BaseSetup.setUp();
 
     RMN.Voter[] memory voters = new RMN.Voter[](1);
@@ -67,17 +66,16 @@ contract CommitStoreRealRMNSetup is PriceRegistrySetup, OCR2BaseSetup {
         rmnProxy: address(s_rmn)
       })
     );
-    CommitStore.DynamicConfig memory dynamicConfig =
-      CommitStore.DynamicConfig({priceRegistry: address(s_priceRegistry)});
+    CommitStore.DynamicConfig memory dynamicConfig = CommitStore.DynamicConfig({priceRegistry: address(s_feeQuoter)});
     s_commitStore.setOCR2Config(
       s_valid_signers, s_valid_transmitters, s_f, abi.encode(dynamicConfig), s_offchainConfigVersion, abi.encode("")
     );
   }
 }
 
-contract CommitStore_constructor is PriceRegistrySetup, OCR2BaseSetup {
-  function setUp() public virtual override(PriceRegistrySetup, OCR2BaseSetup) {
-    PriceRegistrySetup.setUp();
+contract CommitStore_constructor is FeeQuoterSetup, OCR2BaseSetup {
+  function setUp() public virtual override(FeeQuoterSetup, OCR2BaseSetup) {
+    FeeQuoterSetup.setUp();
     OCR2BaseSetup.setUp();
   }
 
@@ -88,8 +86,7 @@ contract CommitStore_constructor is PriceRegistrySetup, OCR2BaseSetup {
       onRamp: 0x2C44CDDdB6a900Fa2B585dd299E03D12Fa4293Bc,
       rmnProxy: address(s_mockRMN)
     });
-    CommitStore.DynamicConfig memory dynamicConfig =
-      CommitStore.DynamicConfig({priceRegistry: address(s_priceRegistry)});
+    CommitStore.DynamicConfig memory dynamicConfig = CommitStore.DynamicConfig({priceRegistry: address(s_feeQuoter)});
 
     vm.expectEmit();
     emit CommitStore.ConfigSet(staticConfig, dynamicConfig);
@@ -354,7 +351,7 @@ contract CommitStore_report is CommitStoreSetup {
     });
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
 
     s_commitStore.report(abi.encode(report), ++s_latestEpochAndRound);
     assertEq(s_latestEpochAndRound, s_commitStore.getLatestPriceEpochAndRound());
@@ -368,7 +365,7 @@ contract CommitStore_report is CommitStoreSetup {
     });
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
 
     s_commitStore.report(abi.encode(report), ++s_latestEpochAndRound);
     assertEq(s_latestEpochAndRound, s_commitStore.getLatestPriceEpochAndRound());
@@ -386,7 +383,7 @@ contract CommitStore_report is CommitStoreSetup {
     });
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(s_sourceFeeToken, tokenPrice1, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(s_sourceFeeToken, tokenPrice1, block.timestamp);
 
     s_commitStore.report(abi.encode(report), ++s_latestEpochAndRound);
     assertEq(s_latestEpochAndRound, s_commitStore.getLatestPriceEpochAndRound());
@@ -476,7 +473,7 @@ contract CommitStore_report is CommitStoreSetup {
     });
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
     s_commitStore.report(abi.encode(report), ++s_latestEpochAndRound);
 
     vm.expectRevert(CommitStore.StaleReport.selector);
diff --git a/contracts/src/v0.8/ccip/test/e2e/MultiRampsEnd2End.sol b/contracts/src/v0.8/ccip/test/e2e/MultiRampsEnd2End.sol
index 5ad0091734..b22e4db9d4 100644
--- a/contracts/src/v0.8/ccip/test/e2e/MultiRampsEnd2End.sol
+++ b/contracts/src/v0.8/ccip/test/e2e/MultiRampsEnd2End.sol
@@ -105,74 +105,90 @@ contract MultiRampsE2E is OnRampSetup, OffRampSetup {
 
   function test_E2E_3MessagesMMultiOffRampSuccess_gas() public {
     vm.pauseGasMetering();
-    IERC20 token0 = IERC20(s_sourceTokens[0]);
-    IERC20 token1 = IERC20(s_sourceTokens[1]);
-    uint256 balance0Pre = token0.balanceOf(OWNER);
-    uint256 balance1Pre = token1.balanceOf(OWNER);
 
-    // Send messages
     Internal.Any2EVMRampMessage[] memory messages1 = new Internal.Any2EVMRampMessage[](2);
-    messages1[0] = _sendRequest(1, SOURCE_CHAIN_SELECTOR, 1, s_metadataHash, s_sourceRouter, s_tokenAdminRegistry);
-    messages1[1] = _sendRequest(2, SOURCE_CHAIN_SELECTOR, 2, s_metadataHash, s_sourceRouter, s_tokenAdminRegistry);
     Internal.Any2EVMRampMessage[] memory messages2 = new Internal.Any2EVMRampMessage[](1);
-    messages2[0] =
-      _sendRequest(1, SOURCE_CHAIN_SELECTOR + 1, 1, s_metadataHash2, s_sourceRouter2, s_tokenAdminRegistry2);
 
-    uint256 expectedFee = s_sourceRouter.getFee(DEST_CHAIN_SELECTOR, _generateTokenMessage());
-    // Asserts that the tokens have been sent and the fee has been paid.
-    assertEq(
-      balance0Pre - (messages1.length + messages2.length) * (i_tokenAmount0 + expectedFee), token0.balanceOf(OWNER)
-    );
-    assertEq(balance1Pre - (messages1.length + messages2.length) * i_tokenAmount1, token1.balanceOf(OWNER));
+    // Scoped to sending to reduce stack pressure
+    {
+      IERC20 token0 = IERC20(s_sourceTokens[0]);
+      IERC20 token1 = IERC20(s_sourceTokens[1]);
 
-    // Commit
-    bytes32[] memory hashedMessages1 = new bytes32[](2);
-    hashedMessages1[0] = messages1[0]._hash(abi.encode(address(s_onRamp)));
-    hashedMessages1[1] = messages1[1]._hash(abi.encode(address(s_onRamp)));
-    bytes32[] memory hashedMessages2 = new bytes32[](1);
-    hashedMessages2[0] = messages2[0]._hash(abi.encode(address(s_onRamp2)));
+      uint256 balance0Pre = token0.balanceOf(OWNER);
+      uint256 balance1Pre = token1.balanceOf(OWNER);
 
-    bytes32[] memory merkleRoots = new bytes32[](2);
-    merkleRoots[0] = MerkleHelper.getMerkleRoot(hashedMessages1);
-    merkleRoots[1] = MerkleHelper.getMerkleRoot(hashedMessages2);
-
-    OffRamp.MerkleRoot[] memory roots = new OffRamp.MerkleRoot[](2);
-    roots[0] = OffRamp.MerkleRoot({
-      sourceChainSelector: SOURCE_CHAIN_SELECTOR,
-      interval: OffRamp.Interval(messages1[0].header.sequenceNumber, messages1[1].header.sequenceNumber),
-      merkleRoot: merkleRoots[0]
-    });
-    roots[1] = OffRamp.MerkleRoot({
-      sourceChainSelector: SOURCE_CHAIN_SELECTOR + 1,
-      interval: OffRamp.Interval(messages2[0].header.sequenceNumber, messages2[0].header.sequenceNumber),
-      merkleRoot: merkleRoots[1]
-    });
+      // Send messages
+      messages1[0] = _sendRequest(1, SOURCE_CHAIN_SELECTOR, 1, s_metadataHash, s_sourceRouter, s_tokenAdminRegistry);
+      messages1[1] = _sendRequest(2, SOURCE_CHAIN_SELECTOR, 2, s_metadataHash, s_sourceRouter, s_tokenAdminRegistry);
+      messages2[0] =
+        _sendRequest(1, SOURCE_CHAIN_SELECTOR + 1, 1, s_metadataHash2, s_sourceRouter2, s_tokenAdminRegistry2);
 
-    OffRamp.CommitReport memory report =
-      OffRamp.CommitReport({priceUpdates: _getEmptyPriceUpdates(), merkleRoots: roots});
+      uint256 expectedFee = s_sourceRouter.getFee(DEST_CHAIN_SELECTOR, _generateTokenMessage());
+      // Asserts that the tokens have been sent and the fee has been paid.
+      assertEq(
+        balance0Pre - (messages1.length + messages2.length) * (i_tokenAmount0 + expectedFee), token0.balanceOf(OWNER)
+      );
+      assertEq(balance1Pre - (messages1.length + messages2.length) * i_tokenAmount1, token1.balanceOf(OWNER));
+    }
 
-    vm.resumeGasMetering();
-    _commit(report, ++s_latestSequenceNumber);
-    vm.pauseGasMetering();
+    // Commit
 
-    s_mockRMN.setTaggedRootBlessed(IRMN.TaggedRoot({commitStore: address(s_offRamp), root: merkleRoots[0]}), true);
-    s_mockRMN.setTaggedRootBlessed(IRMN.TaggedRoot({commitStore: address(s_offRamp), root: merkleRoots[1]}), true);
+    bytes32[] memory merkleRoots = new bytes32[](2);
 
-    bytes32[] memory proofs = new bytes32[](0);
-    bytes32[] memory hashedLeaves = new bytes32[](1);
-    hashedLeaves[0] = merkleRoots[0];
-    uint256 timestamp = s_offRamp.verify(SOURCE_CHAIN_SELECTOR, hashedLeaves, proofs, 2 ** 2 - 1);
-    assertEq(BLOCK_TIME, timestamp);
-    hashedLeaves[0] = merkleRoots[1];
-    timestamp = s_offRamp.verify(SOURCE_CHAIN_SELECTOR + 1, hashedLeaves, proofs, 2 ** 2 - 1);
-    assertEq(BLOCK_TIME, timestamp);
+    // Scoped to commit to reduce stack pressure
+    {
+      bytes32[] memory hashedMessages1 = new bytes32[](2);
+      hashedMessages1[0] = messages1[0]._hash(abi.encode(address(s_onRamp)));
+      hashedMessages1[1] = messages1[1]._hash(abi.encode(address(s_onRamp)));
+      bytes32[] memory hashedMessages2 = new bytes32[](1);
+      hashedMessages2[0] = messages2[0]._hash(abi.encode(address(s_onRamp2)));
+
+      merkleRoots[0] = MerkleHelper.getMerkleRoot(hashedMessages1);
+      merkleRoots[1] = MerkleHelper.getMerkleRoot(hashedMessages2);
+
+      OffRamp.MerkleRoot[] memory roots = new OffRamp.MerkleRoot[](2);
+      roots[0] = OffRamp.MerkleRoot({
+        sourceChainSelector: SOURCE_CHAIN_SELECTOR,
+        interval: OffRamp.Interval(messages1[0].header.sequenceNumber, messages1[1].header.sequenceNumber),
+        merkleRoot: merkleRoots[0]
+      });
+      roots[1] = OffRamp.MerkleRoot({
+        sourceChainSelector: SOURCE_CHAIN_SELECTOR + 1,
+        interval: OffRamp.Interval(messages2[0].header.sequenceNumber, messages2[0].header.sequenceNumber),
+        merkleRoot: merkleRoots[1]
+      });
+
+      OffRamp.CommitReport memory report =
+        OffRamp.CommitReport({priceUpdates: _getEmptyPriceUpdates(), merkleRoots: roots});
+
+      vm.resumeGasMetering();
+      _commit(report, ++s_latestSequenceNumber);
+      vm.pauseGasMetering();
+    }
 
-    // We change the block time so when execute would e.g. use the current
-    // block time instead of the committed block time the value would be
-    // incorrect in the checks below.
-    vm.warp(BLOCK_TIME + 2000);
+    // Scoped to RMN and verify to reduce stack pressure
+    {
+      s_mockRMN.setTaggedRootBlessed(IRMN.TaggedRoot({commitStore: address(s_offRamp), root: merkleRoots[0]}), true);
+      s_mockRMN.setTaggedRootBlessed(IRMN.TaggedRoot({commitStore: address(s_offRamp), root: merkleRoots[1]}), true);
+
+      bytes32[] memory proofs = new bytes32[](0);
+      bytes32[] memory hashedLeaves = new bytes32[](1);
+      hashedLeaves[0] = merkleRoots[0];
+
+      uint256 timestamp = s_offRamp.verify(SOURCE_CHAIN_SELECTOR, hashedLeaves, proofs, 2 ** 2 - 1);
+      assertEq(BLOCK_TIME, timestamp);
+      hashedLeaves[0] = merkleRoots[1];
+      timestamp = s_offRamp.verify(SOURCE_CHAIN_SELECTOR + 1, hashedLeaves, proofs, 2 ** 2 - 1);
+      assertEq(BLOCK_TIME, timestamp);
+
+      // We change the block time so when execute would e.g. use the current
+      // block time instead of the committed block time the value would be
+      // incorrect in the checks below.
+      vm.warp(BLOCK_TIME + 2000);
+    }
 
     // Execute
+
     Internal.ExecutionReportSingleChain[] memory reports = new Internal.ExecutionReportSingleChain[](2);
     reports[0] = _generateReportFromMessages(SOURCE_CHAIN_SELECTOR, messages1);
     reports[1] = _generateReportFromMessages(SOURCE_CHAIN_SELECTOR + 1, messages2);
@@ -185,6 +201,7 @@ contract MultiRampsE2E is OnRampSetup, OffRampSetup {
       SOURCE_CHAIN_SELECTOR,
       messages1[0].header.sequenceNumber,
       messages1[0].header.messageId,
+      messages1[0]._hash(abi.encode(address(s_onRamp))),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -193,6 +210,7 @@ contract MultiRampsE2E is OnRampSetup, OffRampSetup {
       SOURCE_CHAIN_SELECTOR,
       messages1[1].header.sequenceNumber,
       messages1[1].header.messageId,
+      messages1[1]._hash(abi.encode(address(s_onRamp))),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -201,6 +219,7 @@ contract MultiRampsE2E is OnRampSetup, OffRampSetup {
       SOURCE_CHAIN_SELECTOR + 1,
       messages2[0].header.sequenceNumber,
       messages2[0].header.messageId,
+      messages2[0]._hash(abi.encode(address(s_onRamp2))),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -215,9 +234,7 @@ contract MultiRampsE2E is OnRampSetup, OffRampSetup {
     TokenAdminRegistry tokenAdminRegistry
   ) public returns (Internal.Any2EVMRampMessage memory) {
     Client.EVM2AnyMessage memory message = _generateTokenMessage();
-    uint256 expectedFee = router.getFee(DEST_CHAIN_SELECTOR, message);
-
-    IERC20(s_sourceTokens[0]).approve(address(router), i_tokenAmount0 + expectedFee);
+    IERC20(s_sourceTokens[0]).approve(address(router), i_tokenAmount0 + router.getFee(DEST_CHAIN_SELECTOR, message));
     IERC20(s_sourceTokens[1]).approve(address(router), i_tokenAmount1);
 
     message.receiver = abi.encode(address(s_receiver));
@@ -227,7 +244,7 @@ contract MultiRampsE2E is OnRampSetup, OffRampSetup {
       DEST_CHAIN_SELECTOR,
       expectedSeqNum,
       nonce,
-      expectedFee,
+      router.getFee(DEST_CHAIN_SELECTOR, message),
       OWNER,
       metadataHash,
       tokenAdminRegistry
@@ -240,8 +257,6 @@ contract MultiRampsE2E is OnRampSetup, OffRampSetup {
     router.ccipSend(DEST_CHAIN_SELECTOR, message);
     vm.pauseGasMetering();
 
-    uint256 gasLimit = s_priceRegistry.parseEVMExtraArgsFromBytes(msgEvent.extraArgs, DEST_CHAIN_SELECTOR).gasLimit;
-
     return Internal.Any2EVMRampMessage({
       header: Internal.RampMessageHeader({
         messageId: msgEvent.header.messageId,
@@ -253,7 +268,7 @@ contract MultiRampsE2E is OnRampSetup, OffRampSetup {
       sender: abi.encode(msgEvent.sender),
       data: msgEvent.data,
       receiver: abi.decode(msgEvent.receiver, (address)),
-      gasLimit: gasLimit,
+      gasLimit: s_feeQuoter.parseEVMExtraArgsFromBytes(msgEvent.extraArgs, DEST_CHAIN_SELECTOR).gasLimit,
       tokenAmounts: msgEvent.tokenAmounts
     });
   }
diff --git a/contracts/src/v0.8/ccip/test/priceRegistry/PriceRegistry.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.t.sol
similarity index 59%
rename from contracts/src/v0.8/ccip/test/priceRegistry/PriceRegistry.t.sol
rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.t.sol
index bc7b3159b6..f6dc8c25bf 100644
--- a/contracts/src/v0.8/ccip/test/priceRegistry/PriceRegistry.t.sol
+++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.t.sol
@@ -1,21 +1,22 @@
 // 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";
-import {PriceRegistry} from "../../PriceRegistry.sol";
-import {IPriceRegistry} from "../../interfaces/IPriceRegistry.sol";
+import {FeeQuoter} from "../../FeeQuoter.sol";
 import {Client} from "../../libraries/Client.sol";
 import {Internal} from "../../libraries/Internal.sol";
 import {Pool} from "../../libraries/Pool.sol";
 import {USDPriceWith18Decimals} from "../../libraries/USDPriceWith18Decimals.sol";
-import {PriceRegistryHelper} from "../helpers/PriceRegistryHelper.sol";
-import {PriceRegistryFeeSetup, PriceRegistrySetup} from "./PriceRegistrySetup.t.sol";
+import {FeeQuoterHelper} from "../helpers/FeeQuoterHelper.sol";
+import {FeeQuoterFeeSetup, FeeQuoterSetup} from "./FeeQuoterSetup.t.sol";
 
 import {Vm} from "forge-std/Vm.sol";
 
-contract PriceRegistry_constructor is PriceRegistrySetup {
+contract FeeQuoter_constructor is FeeQuoterSetup {
   function test_Setup_Success() public virtual {
     address[] memory priceUpdaters = new address[](2);
     priceUpdaters[0] = STRANGER;
@@ -23,134 +24,133 @@ contract PriceRegistry_constructor is PriceRegistrySetup {
     address[] memory feeTokens = new address[](2);
     feeTokens[0] = s_sourceTokens[0];
     feeTokens[1] = s_sourceTokens[1];
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](2);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](2);
     tokenPriceFeedUpdates[0] =
       _getSingleTokenPriceFeedUpdateStruct(s_sourceTokens[0], s_dataFeedByToken[s_sourceTokens[0]], 18);
     tokenPriceFeedUpdates[1] =
       _getSingleTokenPriceFeedUpdateStruct(s_sourceTokens[1], s_dataFeedByToken[s_sourceTokens[1]], 6);
 
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = _generatePriceRegistryDestChainConfigArgs();
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
 
-    PriceRegistry.StaticConfig memory staticConfig = PriceRegistry.StaticConfig({
+    FeeQuoter.StaticConfig memory staticConfig = FeeQuoter.StaticConfig({
       linkToken: s_sourceTokens[0],
       maxFeeJuelsPerMsg: MAX_MSG_FEES_JUELS,
       stalenessThreshold: uint32(TWELVE_HOURS)
     });
-    s_priceRegistry = new PriceRegistryHelper(
+    s_feeQuoter = new FeeQuoterHelper(
       staticConfig,
       priceUpdaters,
       feeTokens,
       tokenPriceFeedUpdates,
-      s_priceRegistryTokenTransferFeeConfigArgs,
-      s_priceRegistryPremiumMultiplierWeiPerEthArgs,
+      s_feeQuoterTokenTransferFeeConfigArgs,
+      s_feeQuoterPremiumMultiplierWeiPerEthArgs,
       destChainConfigArgs
     );
 
-    _assertPriceRegistryStaticConfigsEqual(s_priceRegistry.getStaticConfig(), staticConfig);
-    assertEq(feeTokens, s_priceRegistry.getFeeTokens());
-    assertEq(priceUpdaters, s_priceRegistry.getAllAuthorizedCallers());
-    assertEq(s_priceRegistry.typeAndVersion(), "PriceRegistry 1.6.0-dev");
+    _assertFeeQuoterStaticConfigsEqual(s_feeQuoter.getStaticConfig(), staticConfig);
+    assertEq(feeTokens, s_feeQuoter.getFeeTokens());
+    assertEq(priceUpdaters, s_feeQuoter.getAllAuthorizedCallers());
+    assertEq(s_feeQuoter.typeAndVersion(), "FeeQuoter 1.6.0-dev");
 
     _assertTokenPriceFeedConfigEquality(
-      tokenPriceFeedUpdates[0].feedConfig, s_priceRegistry.getTokenPriceFeedConfig(s_sourceTokens[0])
+      tokenPriceFeedUpdates[0].feedConfig, s_feeQuoter.getTokenPriceFeedConfig(s_sourceTokens[0])
     );
 
     _assertTokenPriceFeedConfigEquality(
-      tokenPriceFeedUpdates[1].feedConfig, s_priceRegistry.getTokenPriceFeedConfig(s_sourceTokens[1])
+      tokenPriceFeedUpdates[1].feedConfig, s_feeQuoter.getTokenPriceFeedConfig(s_sourceTokens[1])
     );
 
     assertEq(
-      s_priceRegistryPremiumMultiplierWeiPerEthArgs[0].premiumMultiplierWeiPerEth,
-      s_priceRegistry.getPremiumMultiplierWeiPerEth(s_priceRegistryPremiumMultiplierWeiPerEthArgs[0].token)
+      s_feeQuoterPremiumMultiplierWeiPerEthArgs[0].premiumMultiplierWeiPerEth,
+      s_feeQuoter.getPremiumMultiplierWeiPerEth(s_feeQuoterPremiumMultiplierWeiPerEthArgs[0].token)
     );
 
     assertEq(
-      s_priceRegistryPremiumMultiplierWeiPerEthArgs[1].premiumMultiplierWeiPerEth,
-      s_priceRegistry.getPremiumMultiplierWeiPerEth(s_priceRegistryPremiumMultiplierWeiPerEthArgs[1].token)
+      s_feeQuoterPremiumMultiplierWeiPerEthArgs[1].premiumMultiplierWeiPerEth,
+      s_feeQuoter.getPremiumMultiplierWeiPerEth(s_feeQuoterPremiumMultiplierWeiPerEthArgs[1].token)
     );
 
-    PriceRegistry.TokenTransferFeeConfigArgs memory tokenTransferFeeConfigArg =
-      s_priceRegistryTokenTransferFeeConfigArgs[0];
+    FeeQuoter.TokenTransferFeeConfigArgs memory tokenTransferFeeConfigArg = s_feeQuoterTokenTransferFeeConfigArgs[0];
     for (uint256 i = 0; i < tokenTransferFeeConfigArg.tokenTransferFeeConfigs.length; ++i) {
-      PriceRegistry.TokenTransferFeeConfigSingleTokenArgs memory tokenFeeArgs =
-        s_priceRegistryTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[i];
+      FeeQuoter.TokenTransferFeeConfigSingleTokenArgs memory tokenFeeArgs =
+        s_feeQuoterTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[i];
 
       _assertTokenTransferFeeConfigEqual(
         tokenFeeArgs.tokenTransferFeeConfig,
-        s_priceRegistry.getTokenTransferFeeConfig(tokenTransferFeeConfigArg.destChainSelector, tokenFeeArgs.token)
+        s_feeQuoter.getTokenTransferFeeConfig(tokenTransferFeeConfigArg.destChainSelector, tokenFeeArgs.token)
       );
     }
 
     for (uint256 i = 0; i < destChainConfigArgs.length; ++i) {
-      PriceRegistry.DestChainConfig memory expectedConfig = destChainConfigArgs[i].destChainConfig;
+      FeeQuoter.DestChainConfig memory expectedConfig = destChainConfigArgs[i].destChainConfig;
       uint64 destChainSelector = destChainConfigArgs[i].destChainSelector;
 
-      _assertPriceRegistryDestChainConfigsEqual(expectedConfig, s_priceRegistry.getDestChainConfig(destChainSelector));
+      _assertFeeQuoterDestChainConfigsEqual(expectedConfig, s_feeQuoter.getDestChainConfig(destChainSelector));
     }
   }
 
   function test_InvalidStalenessThreshold_Revert() public {
-    PriceRegistry.StaticConfig memory staticConfig = PriceRegistry.StaticConfig({
+    FeeQuoter.StaticConfig memory staticConfig = FeeQuoter.StaticConfig({
       linkToken: s_sourceTokens[0],
       maxFeeJuelsPerMsg: MAX_MSG_FEES_JUELS,
       stalenessThreshold: 0
     });
 
-    vm.expectRevert(PriceRegistry.InvalidStaticConfig.selector);
+    vm.expectRevert(FeeQuoter.InvalidStaticConfig.selector);
 
-    s_priceRegistry = new PriceRegistryHelper(
+    s_feeQuoter = new FeeQuoterHelper(
       staticConfig,
       new address[](0),
       new address[](0),
-      new PriceRegistry.TokenPriceFeedUpdate[](0),
-      s_priceRegistryTokenTransferFeeConfigArgs,
-      s_priceRegistryPremiumMultiplierWeiPerEthArgs,
-      new PriceRegistry.DestChainConfigArgs[](0)
+      new FeeQuoter.TokenPriceFeedUpdate[](0),
+      s_feeQuoterTokenTransferFeeConfigArgs,
+      s_feeQuoterPremiumMultiplierWeiPerEthArgs,
+      new FeeQuoter.DestChainConfigArgs[](0)
     );
   }
 
   function test_InvalidLinkTokenEqZeroAddress_Revert() public {
-    PriceRegistry.StaticConfig memory staticConfig = PriceRegistry.StaticConfig({
+    FeeQuoter.StaticConfig memory staticConfig = FeeQuoter.StaticConfig({
       linkToken: address(0),
       maxFeeJuelsPerMsg: MAX_MSG_FEES_JUELS,
       stalenessThreshold: uint32(TWELVE_HOURS)
     });
 
-    vm.expectRevert(PriceRegistry.InvalidStaticConfig.selector);
+    vm.expectRevert(FeeQuoter.InvalidStaticConfig.selector);
 
-    s_priceRegistry = new PriceRegistryHelper(
+    s_feeQuoter = new FeeQuoterHelper(
       staticConfig,
       new address[](0),
       new address[](0),
-      new PriceRegistry.TokenPriceFeedUpdate[](0),
-      s_priceRegistryTokenTransferFeeConfigArgs,
-      s_priceRegistryPremiumMultiplierWeiPerEthArgs,
-      new PriceRegistry.DestChainConfigArgs[](0)
+      new FeeQuoter.TokenPriceFeedUpdate[](0),
+      s_feeQuoterTokenTransferFeeConfigArgs,
+      s_feeQuoterPremiumMultiplierWeiPerEthArgs,
+      new FeeQuoter.DestChainConfigArgs[](0)
     );
   }
 
   function test_InvalidMaxFeeJuelsPerMsg_Revert() public {
-    PriceRegistry.StaticConfig memory staticConfig = PriceRegistry.StaticConfig({
+    FeeQuoter.StaticConfig memory staticConfig = FeeQuoter.StaticConfig({
       linkToken: s_sourceTokens[0],
       maxFeeJuelsPerMsg: 0,
       stalenessThreshold: uint32(TWELVE_HOURS)
     });
 
-    vm.expectRevert(PriceRegistry.InvalidStaticConfig.selector);
+    vm.expectRevert(FeeQuoter.InvalidStaticConfig.selector);
 
-    s_priceRegistry = new PriceRegistryHelper(
+    s_feeQuoter = new FeeQuoterHelper(
       staticConfig,
       new address[](0),
       new address[](0),
-      new PriceRegistry.TokenPriceFeedUpdate[](0),
-      s_priceRegistryTokenTransferFeeConfigArgs,
-      s_priceRegistryPremiumMultiplierWeiPerEthArgs,
-      new PriceRegistry.DestChainConfigArgs[](0)
+      new FeeQuoter.TokenPriceFeedUpdate[](0),
+      s_feeQuoterTokenTransferFeeConfigArgs,
+      s_feeQuoterPremiumMultiplierWeiPerEthArgs,
+      new FeeQuoter.DestChainConfigArgs[](0)
     );
   }
 }
 
-contract PriceRegistry_getTokenPrices is PriceRegistrySetup {
+contract FeeQuoter_getTokenPrices is FeeQuoterSetup {
   function test_GetTokenPrices_Success() public view {
     Internal.PriceUpdates memory priceUpdates = abi.decode(s_encodedInitialPriceUpdates, (Internal.PriceUpdates));
 
@@ -159,7 +159,7 @@ contract PriceRegistry_getTokenPrices is PriceRegistrySetup {
     tokens[1] = s_sourceTokens[1];
     tokens[2] = s_weth;
 
-    Internal.TimestampedPackedUint224[] memory tokenPrices = s_priceRegistry.getTokenPrices(tokens);
+    Internal.TimestampedPackedUint224[] memory tokenPrices = s_feeQuoter.getTokenPrices(tokens);
 
     assertEq(tokenPrices.length, 3);
     assertEq(tokenPrices[0].value, priceUpdates.tokenPriceUpdates[0].usdPerToken);
@@ -168,7 +168,7 @@ contract PriceRegistry_getTokenPrices is PriceRegistrySetup {
   }
 }
 
-contract PriceRegistry_getTokenPrice is PriceRegistrySetup {
+contract FeeQuoter_getTokenPrice is FeeQuoterSetup {
   function test_GetTokenPriceFromFeed_Success() public {
     uint256 originalTimestampValue = block.timestamp;
 
@@ -176,7 +176,7 @@ contract PriceRegistry_getTokenPrice is PriceRegistrySetup {
     vm.warp(originalTimestampValue + 1 hours);
 
     address sourceToken = _initialiseSingleTokenPriceFeed();
-    Internal.TimestampedPackedUint224 memory tokenPriceAnswer = s_priceRegistry.getTokenPrice(sourceToken);
+    Internal.TimestampedPackedUint224 memory tokenPriceAnswer = s_feeQuoter.getTokenPrice(sourceToken);
 
     // Price answer is 1e8 (18 decimal token) - unit is (1e18 * 1e18 / 1e18) -> expected 1e18
     assertEq(tokenPriceAnswer.value, uint224(1e18));
@@ -184,12 +184,12 @@ contract PriceRegistry_getTokenPrice is PriceRegistrySetup {
   }
 }
 
-contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
+contract FeeQuoter_getValidatedTokenPrice is FeeQuoterSetup {
   function test_GetValidatedTokenPrice_Success() public view {
     Internal.PriceUpdates memory priceUpdates = abi.decode(s_encodedInitialPriceUpdates, (Internal.PriceUpdates));
     address token = priceUpdates.tokenPriceUpdates[0].sourceToken;
 
-    uint224 tokenPrice = s_priceRegistry.getValidatedTokenPrice(token);
+    uint224 tokenPrice = s_feeQuoter.getValidatedTokenPrice(token);
 
     assertEq(priceUpdates.tokenPriceUpdates[0].usdPerToken, tokenPrice);
   }
@@ -201,7 +201,7 @@ contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
     vm.warp(originalTimestampValue + TWELVE_HOURS);
 
     address sourceToken = _initialiseSingleTokenPriceFeed();
-    uint224 tokenPriceAnswer = s_priceRegistry.getValidatedTokenPrice(sourceToken);
+    uint224 tokenPriceAnswer = s_feeQuoter.getValidatedTokenPrice(sourceToken);
 
     // Price answer is 1e8 (18 decimal token) - unit is (1e18 * 1e18 / 1e18) -> expected 1e18
     assertEq(tokenPriceAnswer, uint224(1e18));
@@ -214,7 +214,7 @@ contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
     vm.warp(originalTimestampValue + TWELVE_HOURS + 1);
 
     address sourceToken = _initialiseSingleTokenPriceFeed();
-    uint224 tokenPriceAnswer = s_priceRegistry.getValidatedTokenPrice(sourceToken);
+    uint224 tokenPriceAnswer = s_feeQuoter.getValidatedTokenPrice(sourceToken);
 
     // Price answer is 1e8 (18 decimal token) - unit is (1e18 * 1e18 / 1e18) -> expected 1e18
     assertEq(tokenPriceAnswer, uint224(1e18));
@@ -224,11 +224,11 @@ contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
     address tokenAddress = _deploySourceToken("testToken", 0, 18);
     address feedAddress = _deployTokenPriceDataFeed(tokenAddress, 18, int256(uint256(type(uint224).max)));
 
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] = _getSingleTokenPriceFeedUpdateStruct(tokenAddress, feedAddress, 18);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
-    uint224 tokenPriceAnswer = s_priceRegistry.getValidatedTokenPrice(tokenAddress);
+    uint224 tokenPriceAnswer = s_feeQuoter.getValidatedTokenPrice(tokenAddress);
 
     // Price answer is: uint224.MAX_VALUE * (10 ** (36 - 18 - 18))
     assertEq(tokenPriceAnswer, uint224(type(uint224).max));
@@ -238,11 +238,11 @@ contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
     address tokenAddress = _deploySourceToken("testToken", 0, 6);
     address feedAddress = _deployTokenPriceDataFeed(tokenAddress, 8, 1e8);
 
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] = _getSingleTokenPriceFeedUpdateStruct(tokenAddress, feedAddress, 6);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
-    uint224 tokenPriceAnswer = s_priceRegistry.getValidatedTokenPrice(tokenAddress);
+    uint224 tokenPriceAnswer = s_feeQuoter.getValidatedTokenPrice(tokenAddress);
 
     // Price answer is 1e8 (6 decimal token) - unit is (1e18 * 1e18 / 1e6) -> expected 1e30
     assertEq(tokenPriceAnswer, uint224(1e30));
@@ -252,11 +252,11 @@ contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
     address tokenAddress = _deploySourceToken("testToken", 0, 24);
     address feedAddress = _deployTokenPriceDataFeed(tokenAddress, 8, 1e8);
 
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] = _getSingleTokenPriceFeedUpdateStruct(tokenAddress, feedAddress, 24);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
-    uint224 tokenPriceAnswer = s_priceRegistry.getValidatedTokenPrice(tokenAddress);
+    uint224 tokenPriceAnswer = s_feeQuoter.getValidatedTokenPrice(tokenAddress);
 
     // Price answer is 1e8 (6 decimal token) - unit is (1e18 * 1e18 / 1e24) -> expected 1e12
     assertEq(tokenPriceAnswer, uint224(1e12));
@@ -266,11 +266,11 @@ contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
     address tokenAddress = _deploySourceToken("testToken", 0, 18);
     address feedAddress = _deployTokenPriceDataFeed(tokenAddress, 18, 1e18);
 
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] = _getSingleTokenPriceFeedUpdateStruct(tokenAddress, feedAddress, 18);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
-    uint224 tokenPriceAnswer = s_priceRegistry.getValidatedTokenPrice(tokenAddress);
+    uint224 tokenPriceAnswer = s_feeQuoter.getValidatedTokenPrice(tokenAddress);
 
     // Price answer is 1e8 (6 decimal token) - unit is (1e18 * 1e18 / 1e18) -> expected 1e18
     assertEq(tokenPriceAnswer, uint224(1e18));
@@ -280,11 +280,11 @@ contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
     address tokenAddress = _deploySourceToken("testToken", 0, 0);
     address feedAddress = _deployTokenPriceDataFeed(tokenAddress, 0, 1e31);
 
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] = _getSingleTokenPriceFeedUpdateStruct(tokenAddress, feedAddress, 0);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
-    uint224 tokenPriceAnswer = s_priceRegistry.getValidatedTokenPrice(tokenAddress);
+    uint224 tokenPriceAnswer = s_feeQuoter.getValidatedTokenPrice(tokenAddress);
 
     // Price answer is 1e31 (0 decimal token) - unit is (1e18 * 1e18 / 1e0) -> expected 1e36
     assertEq(tokenPriceAnswer, uint224(1e67));
@@ -294,11 +294,11 @@ contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
     address tokenAddress = _deploySourceToken("testToken", 0, 20);
     address feedAddress = _deployTokenPriceDataFeed(tokenAddress, 20, 1e18);
 
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] = _getSingleTokenPriceFeedUpdateStruct(tokenAddress, feedAddress, 20);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
-    uint224 tokenPriceAnswer = s_priceRegistry.getValidatedTokenPrice(tokenAddress);
+    uint224 tokenPriceAnswer = s_feeQuoter.getValidatedTokenPrice(tokenAddress);
 
     // Price answer is 1e8 (6 decimal token) - unit is (1e18 * 1e18 / 1e20) -> expected 1e14
     assertEq(tokenPriceAnswer, uint224(1e14));
@@ -310,7 +310,7 @@ contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
     Internal.PriceUpdates memory priceUpdates = abi.decode(s_encodedInitialPriceUpdates, (Internal.PriceUpdates));
     address token = priceUpdates.tokenPriceUpdates[0].sourceToken;
 
-    uint224 tokenPrice = s_priceRegistry.getValidatedTokenPrice(token);
+    uint224 tokenPrice = s_feeQuoter.getValidatedTokenPrice(token);
 
     assertEq(priceUpdates.tokenPriceUpdates[0].usdPerToken, tokenPrice);
   }
@@ -321,66 +321,66 @@ contract PriceRegistry_getValidatedTokenPrice is PriceRegistrySetup {
     address tokenAddress = _deploySourceToken("testToken", 0, 18);
     address feedAddress = _deployTokenPriceDataFeed(tokenAddress, 18, int256(uint256(type(uint224).max) + 1));
 
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] = _getSingleTokenPriceFeedUpdateStruct(tokenAddress, feedAddress, 18);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
-    vm.expectRevert(PriceRegistry.DataFeedValueOutOfUint224Range.selector);
-    s_priceRegistry.getValidatedTokenPrice(tokenAddress);
+    vm.expectRevert(FeeQuoter.DataFeedValueOutOfUint224Range.selector);
+    s_feeQuoter.getValidatedTokenPrice(tokenAddress);
   }
 
   function test_UnderflowFeedPrice_Revert() public {
     address tokenAddress = _deploySourceToken("testToken", 0, 18);
     address feedAddress = _deployTokenPriceDataFeed(tokenAddress, 18, -1);
 
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] = _getSingleTokenPriceFeedUpdateStruct(tokenAddress, feedAddress, 18);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
-    vm.expectRevert(PriceRegistry.DataFeedValueOutOfUint224Range.selector);
-    s_priceRegistry.getValidatedTokenPrice(tokenAddress);
+    vm.expectRevert(FeeQuoter.DataFeedValueOutOfUint224Range.selector);
+    s_feeQuoter.getValidatedTokenPrice(tokenAddress);
   }
 
   function test_TokenNotSupported_Revert() public {
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.TokenNotSupported.selector, DUMMY_CONTRACT_ADDRESS));
-    s_priceRegistry.getValidatedTokenPrice(DUMMY_CONTRACT_ADDRESS);
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.TokenNotSupported.selector, DUMMY_CONTRACT_ADDRESS));
+    s_feeQuoter.getValidatedTokenPrice(DUMMY_CONTRACT_ADDRESS);
   }
 
   function test_TokenNotSupportedFeed_Revert() public {
     address sourceToken = _initialiseSingleTokenPriceFeed();
     MockV3Aggregator(s_dataFeedByToken[sourceToken]).updateAnswer(0);
 
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.TokenNotSupported.selector, sourceToken));
-    s_priceRegistry.getValidatedTokenPrice(sourceToken);
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.TokenNotSupported.selector, sourceToken));
+    s_feeQuoter.getValidatedTokenPrice(sourceToken);
   }
 }
 
-contract PriceRegistry_applyFeeTokensUpdates is PriceRegistrySetup {
+contract FeeQuoter_applyFeeTokensUpdates is FeeQuoterSetup {
   function test_ApplyFeeTokensUpdates_Success() public {
     address[] memory feeTokens = new address[](1);
     feeTokens[0] = s_sourceTokens[1];
 
     vm.expectEmit();
-    emit PriceRegistry.FeeTokenAdded(feeTokens[0]);
+    emit FeeQuoter.FeeTokenAdded(feeTokens[0]);
 
-    s_priceRegistry.applyFeeTokensUpdates(feeTokens, new address[](0));
-    assertEq(s_priceRegistry.getFeeTokens().length, 3);
-    assertEq(s_priceRegistry.getFeeTokens()[2], feeTokens[0]);
+    s_feeQuoter.applyFeeTokensUpdates(feeTokens, new address[](0));
+    assertEq(s_feeQuoter.getFeeTokens().length, 3);
+    assertEq(s_feeQuoter.getFeeTokens()[2], feeTokens[0]);
 
     // add same feeToken is no-op
-    s_priceRegistry.applyFeeTokensUpdates(feeTokens, new address[](0));
-    assertEq(s_priceRegistry.getFeeTokens().length, 3);
-    assertEq(s_priceRegistry.getFeeTokens()[2], feeTokens[0]);
+    s_feeQuoter.applyFeeTokensUpdates(feeTokens, new address[](0));
+    assertEq(s_feeQuoter.getFeeTokens().length, 3);
+    assertEq(s_feeQuoter.getFeeTokens()[2], feeTokens[0]);
 
     vm.expectEmit();
-    emit PriceRegistry.FeeTokenRemoved(feeTokens[0]);
+    emit FeeQuoter.FeeTokenRemoved(feeTokens[0]);
 
-    s_priceRegistry.applyFeeTokensUpdates(new address[](0), feeTokens);
-    assertEq(s_priceRegistry.getFeeTokens().length, 2);
+    s_feeQuoter.applyFeeTokensUpdates(new address[](0), feeTokens);
+    assertEq(s_feeQuoter.getFeeTokens().length, 2);
 
     // removing already removed feeToken is no-op
-    s_priceRegistry.applyFeeTokensUpdates(new address[](0), feeTokens);
-    assertEq(s_priceRegistry.getFeeTokens().length, 2);
+    s_feeQuoter.applyFeeTokensUpdates(new address[](0), feeTokens);
+    assertEq(s_feeQuoter.getFeeTokens().length, 2);
   }
 
   function test_OnlyCallableByOwner_Revert() public {
@@ -388,11 +388,11 @@ contract PriceRegistry_applyFeeTokensUpdates is PriceRegistrySetup {
     feeTokens[0] = STRANGER;
     vm.startPrank(STRANGER);
     vm.expectRevert("Only callable by owner");
-    s_priceRegistry.applyFeeTokensUpdates(feeTokens, new address[](0));
+    s_feeQuoter.applyFeeTokensUpdates(feeTokens, new address[](0));
   }
 }
 
-contract PriceRegistry_updatePrices is PriceRegistrySetup {
+contract FeeQuoter_updatePrices is FeeQuoterSetup {
   function test_OnlyTokenPrice_Success() public {
     Internal.PriceUpdates memory update = Internal.PriceUpdates({
       tokenPriceUpdates: new Internal.TokenPriceUpdate[](1),
@@ -401,13 +401,13 @@ contract PriceRegistry_updatePrices is PriceRegistrySetup {
     update.tokenPriceUpdates[0] = Internal.TokenPriceUpdate({sourceToken: s_sourceTokens[0], usdPerToken: 4e18});
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(
+    emit FeeQuoter.UsdPerTokenUpdated(
       update.tokenPriceUpdates[0].sourceToken, update.tokenPriceUpdates[0].usdPerToken, block.timestamp
     );
 
-    s_priceRegistry.updatePrices(update);
+    s_feeQuoter.updatePrices(update);
 
-    assertEq(s_priceRegistry.getTokenPrice(s_sourceTokens[0]).value, update.tokenPriceUpdates[0].usdPerToken);
+    assertEq(s_feeQuoter.getTokenPrice(s_sourceTokens[0]).value, update.tokenPriceUpdates[0].usdPerToken);
   }
 
   function test_OnlyGasPrice_Success() public {
@@ -419,14 +419,14 @@ contract PriceRegistry_updatePrices is PriceRegistrySetup {
       Internal.GasPriceUpdate({destChainSelector: DEST_CHAIN_SELECTOR, usdPerUnitGas: 2000e18});
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerUnitGasUpdated(
+    emit FeeQuoter.UsdPerUnitGasUpdated(
       update.gasPriceUpdates[0].destChainSelector, update.gasPriceUpdates[0].usdPerUnitGas, block.timestamp
     );
 
-    s_priceRegistry.updatePrices(update);
+    s_feeQuoter.updatePrices(update);
 
     assertEq(
-      s_priceRegistry.getDestinationChainGasPrice(DEST_CHAIN_SELECTOR).value, update.gasPriceUpdates[0].usdPerUnitGas
+      s_feeQuoter.getDestinationChainGasPrice(DEST_CHAIN_SELECTOR).value, update.gasPriceUpdates[0].usdPerUnitGas
     );
   }
 
@@ -446,27 +446,27 @@ contract PriceRegistry_updatePrices is PriceRegistrySetup {
 
     for (uint256 i = 0; i < tokenPriceUpdates.length; ++i) {
       vm.expectEmit();
-      emit PriceRegistry.UsdPerTokenUpdated(
+      emit FeeQuoter.UsdPerTokenUpdated(
         update.tokenPriceUpdates[i].sourceToken, update.tokenPriceUpdates[i].usdPerToken, block.timestamp
       );
     }
     for (uint256 i = 0; i < gasPriceUpdates.length; ++i) {
       vm.expectEmit();
-      emit PriceRegistry.UsdPerUnitGasUpdated(
+      emit FeeQuoter.UsdPerUnitGasUpdated(
         update.gasPriceUpdates[i].destChainSelector, update.gasPriceUpdates[i].usdPerUnitGas, block.timestamp
       );
     }
 
-    s_priceRegistry.updatePrices(update);
+    s_feeQuoter.updatePrices(update);
 
     for (uint256 i = 0; i < tokenPriceUpdates.length; ++i) {
       assertEq(
-        s_priceRegistry.getTokenPrice(update.tokenPriceUpdates[i].sourceToken).value, tokenPriceUpdates[i].usdPerToken
+        s_feeQuoter.getTokenPrice(update.tokenPriceUpdates[i].sourceToken).value, tokenPriceUpdates[i].usdPerToken
       );
     }
     for (uint256 i = 0; i < gasPriceUpdates.length; ++i) {
       assertEq(
-        s_priceRegistry.getDestinationChainGasPrice(update.gasPriceUpdates[i].destChainSelector).value,
+        s_feeQuoter.getDestinationChainGasPrice(update.gasPriceUpdates[i].destChainSelector).value,
         gasPriceUpdates[i].usdPerUnitGas
       );
     }
@@ -482,33 +482,33 @@ contract PriceRegistry_updatePrices is PriceRegistrySetup {
     // Revert when caller is not authorized
     vm.startPrank(STRANGER);
     vm.expectRevert(abi.encodeWithSelector(AuthorizedCallers.UnauthorizedCaller.selector, STRANGER));
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
 
     address[] memory priceUpdaters = new address[](1);
     priceUpdaters[0] = STRANGER;
     vm.startPrank(OWNER);
-    s_priceRegistry.applyAuthorizedCallerUpdates(
+    s_feeQuoter.applyAuthorizedCallerUpdates(
       AuthorizedCallers.AuthorizedCallerArgs({addedCallers: priceUpdaters, removedCallers: new address[](0)})
     );
 
     // Stranger is now an authorized caller to update prices
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(
+    emit FeeQuoter.UsdPerTokenUpdated(
       priceUpdates.tokenPriceUpdates[0].sourceToken, priceUpdates.tokenPriceUpdates[0].usdPerToken, block.timestamp
     );
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
 
-    assertEq(s_priceRegistry.getTokenPrice(s_sourceTokens[0]).value, priceUpdates.tokenPriceUpdates[0].usdPerToken);
+    assertEq(s_feeQuoter.getTokenPrice(s_sourceTokens[0]).value, priceUpdates.tokenPriceUpdates[0].usdPerToken);
 
     vm.startPrank(OWNER);
-    s_priceRegistry.applyAuthorizedCallerUpdates(
+    s_feeQuoter.applyAuthorizedCallerUpdates(
       AuthorizedCallers.AuthorizedCallerArgs({addedCallers: new address[](0), removedCallers: priceUpdaters})
     );
 
     // Revert when authorized caller is removed
     vm.startPrank(STRANGER);
     vm.expectRevert(abi.encodeWithSelector(AuthorizedCallers.UnauthorizedCaller.selector, STRANGER));
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
   }
 
   // Reverts
@@ -521,18 +521,18 @@ contract PriceRegistry_updatePrices is PriceRegistrySetup {
 
     vm.startPrank(STRANGER);
     vm.expectRevert(abi.encodeWithSelector(AuthorizedCallers.UnauthorizedCaller.selector, STRANGER));
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
   }
 }
 
-contract PriceRegistry_convertTokenAmount is PriceRegistrySetup {
+contract FeeQuoter_convertTokenAmount is FeeQuoterSetup {
   function test_ConvertTokenAmount_Success() public view {
     Internal.PriceUpdates memory initialPriceUpdates = abi.decode(s_encodedInitialPriceUpdates, (Internal.PriceUpdates));
     uint256 amount = 3e16;
     uint256 conversionRate = (uint256(initialPriceUpdates.tokenPriceUpdates[2].usdPerToken) * 1e18)
       / uint256(initialPriceUpdates.tokenPriceUpdates[0].usdPerToken);
     uint256 expected = (amount * conversionRate) / 1e18;
-    assertEq(s_priceRegistry.convertTokenAmount(s_weth, amount, s_sourceTokens[0]), expected);
+    assertEq(s_feeQuoter.convertTokenAmount(s_weth, amount, s_sourceTokens[0]), expected);
   }
 
   function test_Fuzz_ConvertTokenAmount_Success(
@@ -550,7 +550,7 @@ contract PriceRegistry_convertTokenAmount is PriceRegistrySetup {
     address linkToken = address(2);
     address[] memory feeTokens = new address[](1);
     feeTokens[0] = feeToken;
-    s_priceRegistry.applyFeeTokensUpdates(feeTokens, new address[](0));
+    s_feeQuoter.applyFeeTokensUpdates(feeTokens, new address[](0));
 
     Internal.TokenPriceUpdate[] memory tokenPriceUpdates = new Internal.TokenPriceUpdate[](2);
     tokenPriceUpdates[0] = Internal.TokenPriceUpdate({sourceToken: feeToken, usdPerToken: usdPerFeeToken});
@@ -562,27 +562,26 @@ contract PriceRegistry_convertTokenAmount is PriceRegistrySetup {
     Internal.PriceUpdates memory priceUpdates =
       Internal.PriceUpdates({tokenPriceUpdates: tokenPriceUpdates, gasPriceUpdates: gasPriceUpdates});
 
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
 
-    uint256 linkFee = s_priceRegistry.convertTokenAmount(feeToken, feeTokenAmount, linkToken);
+    uint256 linkFee = s_feeQuoter.convertTokenAmount(feeToken, feeTokenAmount, linkToken);
     assertEq(linkFee, (feeTokenAmount * usdPerFeeToken) / usdPerLinkToken);
   }
 
   // Reverts
 
   function test_LinkTokenNotSupported_Revert() public {
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.TokenNotSupported.selector, DUMMY_CONTRACT_ADDRESS));
-    s_priceRegistry.convertTokenAmount(DUMMY_CONTRACT_ADDRESS, 3e16, s_sourceTokens[0]);
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.TokenNotSupported.selector, DUMMY_CONTRACT_ADDRESS));
+    s_feeQuoter.convertTokenAmount(DUMMY_CONTRACT_ADDRESS, 3e16, s_sourceTokens[0]);
 
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.TokenNotSupported.selector, DUMMY_CONTRACT_ADDRESS));
-    s_priceRegistry.convertTokenAmount(s_sourceTokens[0], 3e16, DUMMY_CONTRACT_ADDRESS);
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.TokenNotSupported.selector, DUMMY_CONTRACT_ADDRESS));
+    s_feeQuoter.convertTokenAmount(s_sourceTokens[0], 3e16, DUMMY_CONTRACT_ADDRESS);
   }
 }
 
-contract PriceRegistry_getTokenAndGasPrices is PriceRegistrySetup {
+contract FeeQuoter_getTokenAndGasPrices is FeeQuoterSetup {
   function test_GetFeeTokenAndGasPrices_Success() public view {
-    (uint224 feeTokenPrice, uint224 gasPrice) =
-      s_priceRegistry.getTokenAndGasPrices(s_sourceFeeToken, DEST_CHAIN_SELECTOR);
+    (uint224 feeTokenPrice, uint224 gasPrice) = s_feeQuoter.getTokenAndGasPrices(s_sourceFeeToken, DEST_CHAIN_SELECTOR);
 
     Internal.PriceUpdates memory priceUpdates = abi.decode(s_encodedInitialPriceUpdates, (Internal.PriceUpdates));
 
@@ -597,150 +596,138 @@ contract PriceRegistry_getTokenAndGasPrices is PriceRegistrySetup {
 
     Internal.PriceUpdates memory priceUpdates =
       Internal.PriceUpdates({tokenPriceUpdates: new Internal.TokenPriceUpdate[](0), gasPriceUpdates: gasPriceUpdates});
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
 
-    (, uint224 gasPrice) = s_priceRegistry.getTokenAndGasPrices(s_sourceFeeToken, zeroGasDestChainSelector);
+    (, uint224 gasPrice) = s_feeQuoter.getTokenAndGasPrices(s_sourceFeeToken, zeroGasDestChainSelector);
 
     assertEq(gasPrice, priceUpdates.gasPriceUpdates[0].usdPerUnitGas);
   }
 
   function test_UnsupportedChain_Revert() public {
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.ChainNotSupported.selector, DEST_CHAIN_SELECTOR + 1));
-    s_priceRegistry.getTokenAndGasPrices(s_sourceTokens[0], DEST_CHAIN_SELECTOR + 1);
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.ChainNotSupported.selector, DEST_CHAIN_SELECTOR + 1));
+    s_feeQuoter.getTokenAndGasPrices(s_sourceTokens[0], DEST_CHAIN_SELECTOR + 1);
   }
 
   function test_StaleGasPrice_Revert() public {
     uint256 diff = TWELVE_HOURS + 1;
     vm.warp(block.timestamp + diff);
-    vm.expectRevert(
-      abi.encodeWithSelector(PriceRegistry.StaleGasPrice.selector, DEST_CHAIN_SELECTOR, TWELVE_HOURS, diff)
-    );
-    s_priceRegistry.getTokenAndGasPrices(s_sourceTokens[0], DEST_CHAIN_SELECTOR);
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.StaleGasPrice.selector, DEST_CHAIN_SELECTOR, TWELVE_HOURS, diff));
+    s_feeQuoter.getTokenAndGasPrices(s_sourceTokens[0], DEST_CHAIN_SELECTOR);
   }
 }
 
-contract PriceRegistry_updateTokenPriceFeeds is PriceRegistrySetup {
+contract FeeQuoter_updateTokenPriceFeeds is FeeQuoterSetup {
   function test_ZeroFeeds_Success() public {
     Vm.Log[] memory logEntries = vm.getRecordedLogs();
 
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](0);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](0);
     vm.recordLogs();
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
     // Verify no log emissions
     assertEq(logEntries.length, 0);
   }
 
   function test_SingleFeedUpdate_Success() public {
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] =
       _getSingleTokenPriceFeedUpdateStruct(s_sourceTokens[0], s_dataFeedByToken[s_sourceTokens[0]], 18);
 
-    _assertTokenPriceFeedConfigUnconfigured(
-      s_priceRegistry.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken)
-    );
+    _assertTokenPriceFeedConfigUnconfigured(s_feeQuoter.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken));
 
     vm.expectEmit();
-    emit PriceRegistry.PriceFeedPerTokenUpdated(
-      tokenPriceFeedUpdates[0].sourceToken, tokenPriceFeedUpdates[0].feedConfig
-    );
+    emit FeeQuoter.PriceFeedPerTokenUpdated(tokenPriceFeedUpdates[0].sourceToken, tokenPriceFeedUpdates[0].feedConfig);
 
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
     _assertTokenPriceFeedConfigEquality(
-      s_priceRegistry.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken), tokenPriceFeedUpdates[0].feedConfig
+      s_feeQuoter.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken), tokenPriceFeedUpdates[0].feedConfig
     );
   }
 
   function test_MultipleFeedUpdate_Success() public {
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](2);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](2);
 
     for (uint256 i = 0; i < 2; ++i) {
       tokenPriceFeedUpdates[i] =
         _getSingleTokenPriceFeedUpdateStruct(s_sourceTokens[i], s_dataFeedByToken[s_sourceTokens[i]], 18);
 
-      _assertTokenPriceFeedConfigUnconfigured(
-        s_priceRegistry.getTokenPriceFeedConfig(tokenPriceFeedUpdates[i].sourceToken)
-      );
+      _assertTokenPriceFeedConfigUnconfigured(s_feeQuoter.getTokenPriceFeedConfig(tokenPriceFeedUpdates[i].sourceToken));
 
       vm.expectEmit();
-      emit PriceRegistry.PriceFeedPerTokenUpdated(
-        tokenPriceFeedUpdates[i].sourceToken, tokenPriceFeedUpdates[i].feedConfig
-      );
+      emit FeeQuoter.PriceFeedPerTokenUpdated(tokenPriceFeedUpdates[i].sourceToken, tokenPriceFeedUpdates[i].feedConfig);
     }
 
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
     _assertTokenPriceFeedConfigEquality(
-      s_priceRegistry.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken), tokenPriceFeedUpdates[0].feedConfig
+      s_feeQuoter.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken), tokenPriceFeedUpdates[0].feedConfig
     );
     _assertTokenPriceFeedConfigEquality(
-      s_priceRegistry.getTokenPriceFeedConfig(tokenPriceFeedUpdates[1].sourceToken), tokenPriceFeedUpdates[1].feedConfig
+      s_feeQuoter.getTokenPriceFeedConfig(tokenPriceFeedUpdates[1].sourceToken), tokenPriceFeedUpdates[1].feedConfig
     );
   }
 
   function test_FeedUnset_Success() public {
-    Internal.TimestampedPackedUint224 memory priceQueryInitial = s_priceRegistry.getTokenPrice(s_sourceTokens[0]);
+    Internal.TimestampedPackedUint224 memory priceQueryInitial = s_feeQuoter.getTokenPrice(s_sourceTokens[0]);
     assertFalse(priceQueryInitial.value == 0);
     assertFalse(priceQueryInitial.timestamp == 0);
 
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] =
       _getSingleTokenPriceFeedUpdateStruct(s_sourceTokens[0], s_dataFeedByToken[s_sourceTokens[0]], 18);
 
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
     _assertTokenPriceFeedConfigEquality(
-      s_priceRegistry.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken), tokenPriceFeedUpdates[0].feedConfig
+      s_feeQuoter.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken), tokenPriceFeedUpdates[0].feedConfig
     );
 
     tokenPriceFeedUpdates[0].feedConfig.dataFeedAddress = address(0);
     vm.expectEmit();
-    emit PriceRegistry.PriceFeedPerTokenUpdated(
-      tokenPriceFeedUpdates[0].sourceToken, tokenPriceFeedUpdates[0].feedConfig
-    );
+    emit FeeQuoter.PriceFeedPerTokenUpdated(tokenPriceFeedUpdates[0].sourceToken, tokenPriceFeedUpdates[0].feedConfig);
 
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
     _assertTokenPriceFeedConfigEquality(
-      s_priceRegistry.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken), tokenPriceFeedUpdates[0].feedConfig
+      s_feeQuoter.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken), tokenPriceFeedUpdates[0].feedConfig
     );
 
     // Price data should remain after a feed has been set->unset
-    Internal.TimestampedPackedUint224 memory priceQueryPostUnsetFeed = s_priceRegistry.getTokenPrice(s_sourceTokens[0]);
+    Internal.TimestampedPackedUint224 memory priceQueryPostUnsetFeed = s_feeQuoter.getTokenPrice(s_sourceTokens[0]);
     assertEq(priceQueryPostUnsetFeed.value, priceQueryInitial.value);
     assertEq(priceQueryPostUnsetFeed.timestamp, priceQueryInitial.timestamp);
   }
 
   function test_FeedNotUpdated() public {
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] =
       _getSingleTokenPriceFeedUpdateStruct(s_sourceTokens[0], s_dataFeedByToken[s_sourceTokens[0]], 18);
 
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
 
     _assertTokenPriceFeedConfigEquality(
-      s_priceRegistry.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken), tokenPriceFeedUpdates[0].feedConfig
+      s_feeQuoter.getTokenPriceFeedConfig(tokenPriceFeedUpdates[0].sourceToken), tokenPriceFeedUpdates[0].feedConfig
     );
   }
 
   // Reverts
 
   function test_FeedUpdatedByNonOwner_Revert() public {
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] =
       _getSingleTokenPriceFeedUpdateStruct(s_sourceTokens[0], s_dataFeedByToken[s_sourceTokens[0]], 18);
 
     vm.startPrank(STRANGER);
     vm.expectRevert("Only callable by owner");
 
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
   }
 }
 
-contract PriceRegistry_applyDestChainConfigUpdates is PriceRegistrySetup {
-  function test_Fuzz_applyDestChainConfigUpdates_Success(PriceRegistry.DestChainConfigArgs memory destChainConfigArgs)
-    public
-  {
+contract FeeQuoter_applyDestChainConfigUpdates is FeeQuoterSetup {
+  function test_Fuzz_applyDestChainConfigUpdates_Success(
+    FeeQuoter.DestChainConfigArgs memory destChainConfigArgs
+  ) public {
     vm.assume(destChainConfigArgs.destChainSelector != 0);
     vm.assume(destChainConfigArgs.destChainConfig.maxPerMsgGasLimit != 0);
     destChainConfigArgs.destChainConfig.defaultTxGasLimit = uint32(
@@ -748,66 +735,56 @@ contract PriceRegistry_applyDestChainConfigUpdates is PriceRegistrySetup {
         destChainConfigArgs.destChainConfig.defaultTxGasLimit, 1, destChainConfigArgs.destChainConfig.maxPerMsgGasLimit
       )
     );
-    destChainConfigArgs.destChainConfig.defaultTokenDestBytesOverhead = uint32(
-      bound(
-        destChainConfigArgs.destChainConfig.defaultTokenDestBytesOverhead,
-        Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES,
-        type(uint32).max
-      )
-    );
     destChainConfigArgs.destChainConfig.chainFamilySelector = Internal.CHAIN_FAMILY_SELECTOR_EVM;
 
     bool isNewChain = destChainConfigArgs.destChainSelector != DEST_CHAIN_SELECTOR;
 
-    PriceRegistry.DestChainConfigArgs[] memory newDestChainConfigArgs = new PriceRegistry.DestChainConfigArgs[](1);
+    FeeQuoter.DestChainConfigArgs[] memory newDestChainConfigArgs = new FeeQuoter.DestChainConfigArgs[](1);
     newDestChainConfigArgs[0] = destChainConfigArgs;
 
     if (isNewChain) {
       vm.expectEmit();
-      emit PriceRegistry.DestChainAdded(destChainConfigArgs.destChainSelector, destChainConfigArgs.destChainConfig);
+      emit FeeQuoter.DestChainAdded(destChainConfigArgs.destChainSelector, destChainConfigArgs.destChainConfig);
     } else {
       vm.expectEmit();
-      emit PriceRegistry.DestChainConfigUpdated(
-        destChainConfigArgs.destChainSelector, destChainConfigArgs.destChainConfig
-      );
+      emit FeeQuoter.DestChainConfigUpdated(destChainConfigArgs.destChainSelector, destChainConfigArgs.destChainConfig);
     }
 
-    s_priceRegistry.applyDestChainConfigUpdates(newDestChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(newDestChainConfigArgs);
 
-    _assertPriceRegistryDestChainConfigsEqual(
-      destChainConfigArgs.destChainConfig, s_priceRegistry.getDestChainConfig(destChainConfigArgs.destChainSelector)
+    _assertFeeQuoterDestChainConfigsEqual(
+      destChainConfigArgs.destChainConfig, s_feeQuoter.getDestChainConfig(destChainConfigArgs.destChainSelector)
     );
   }
 
   function test_applyDestChainConfigUpdates_Success() public {
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = new PriceRegistry.DestChainConfigArgs[](2);
-    destChainConfigArgs[0] = _generatePriceRegistryDestChainConfigArgs()[0];
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = new FeeQuoter.DestChainConfigArgs[](2);
+    destChainConfigArgs[0] = _generateFeeQuoterDestChainConfigArgs()[0];
     destChainConfigArgs[0].destChainConfig.isEnabled = false;
-    destChainConfigArgs[1] = _generatePriceRegistryDestChainConfigArgs()[0];
+    destChainConfigArgs[1] = _generateFeeQuoterDestChainConfigArgs()[0];
     destChainConfigArgs[1].destChainSelector = DEST_CHAIN_SELECTOR + 1;
 
     vm.expectEmit();
-    emit PriceRegistry.DestChainConfigUpdated(DEST_CHAIN_SELECTOR, destChainConfigArgs[0].destChainConfig);
+    emit FeeQuoter.DestChainConfigUpdated(DEST_CHAIN_SELECTOR, destChainConfigArgs[0].destChainConfig);
     vm.expectEmit();
-    emit PriceRegistry.DestChainAdded(DEST_CHAIN_SELECTOR + 1, destChainConfigArgs[1].destChainConfig);
+    emit FeeQuoter.DestChainAdded(DEST_CHAIN_SELECTOR + 1, destChainConfigArgs[1].destChainConfig);
 
     vm.recordLogs();
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
 
-    PriceRegistry.DestChainConfig memory gotDestChainConfig0 = s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR);
-    PriceRegistry.DestChainConfig memory gotDestChainConfig1 =
-      s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR + 1);
+    FeeQuoter.DestChainConfig memory gotDestChainConfig0 = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR);
+    FeeQuoter.DestChainConfig memory gotDestChainConfig1 = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR + 1);
 
     assertEq(vm.getRecordedLogs().length, 2);
-    _assertPriceRegistryDestChainConfigsEqual(destChainConfigArgs[0].destChainConfig, gotDestChainConfig0);
-    _assertPriceRegistryDestChainConfigsEqual(destChainConfigArgs[1].destChainConfig, gotDestChainConfig1);
+    _assertFeeQuoterDestChainConfigsEqual(destChainConfigArgs[0].destChainConfig, gotDestChainConfig0);
+    _assertFeeQuoterDestChainConfigsEqual(destChainConfigArgs[1].destChainConfig, gotDestChainConfig1);
   }
 
   function test_applyDestChainConfigUpdatesZeroIntput_Success() public {
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = new PriceRegistry.DestChainConfigArgs[](0);
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = new FeeQuoter.DestChainConfigArgs[](0);
 
     vm.recordLogs();
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
 
     assertEq(vm.getRecordedLogs().length, 0);
   }
@@ -815,73 +792,62 @@ contract PriceRegistry_applyDestChainConfigUpdates is PriceRegistrySetup {
   // Reverts
 
   function test_applyDestChainConfigUpdatesDefaultTxGasLimitEqZero_Revert() public {
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = _generatePriceRegistryDestChainConfigArgs();
-    PriceRegistry.DestChainConfigArgs memory destChainConfigArg = destChainConfigArgs[0];
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
+    FeeQuoter.DestChainConfigArgs memory destChainConfigArg = destChainConfigArgs[0];
 
     destChainConfigArg.destChainConfig.defaultTxGasLimit = 0;
     vm.expectRevert(
-      abi.encodeWithSelector(PriceRegistry.InvalidDestChainConfig.selector, destChainConfigArg.destChainSelector)
+      abi.encodeWithSelector(FeeQuoter.InvalidDestChainConfig.selector, destChainConfigArg.destChainSelector)
     );
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
   }
 
   function test_applyDestChainConfigUpdatesDefaultTxGasLimitGtMaxPerMessageGasLimit_Revert() public {
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = _generatePriceRegistryDestChainConfigArgs();
-    PriceRegistry.DestChainConfigArgs memory destChainConfigArg = destChainConfigArgs[0];
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
+    FeeQuoter.DestChainConfigArgs memory destChainConfigArg = destChainConfigArgs[0];
 
     // Allow setting to the max value
     destChainConfigArg.destChainConfig.defaultTxGasLimit = destChainConfigArg.destChainConfig.maxPerMsgGasLimit;
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
 
     // Revert when exceeding max value
     destChainConfigArg.destChainConfig.defaultTxGasLimit = destChainConfigArg.destChainConfig.maxPerMsgGasLimit + 1;
     vm.expectRevert(
-      abi.encodeWithSelector(PriceRegistry.InvalidDestChainConfig.selector, destChainConfigArg.destChainSelector)
+      abi.encodeWithSelector(FeeQuoter.InvalidDestChainConfig.selector, destChainConfigArg.destChainSelector)
     );
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
   }
 
   function test_InvalidDestChainConfigDestChainSelectorEqZero_Revert() public {
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = _generatePriceRegistryDestChainConfigArgs();
-    PriceRegistry.DestChainConfigArgs memory destChainConfigArg = destChainConfigArgs[0];
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
+    FeeQuoter.DestChainConfigArgs memory destChainConfigArg = destChainConfigArgs[0];
 
     destChainConfigArg.destChainSelector = 0;
     vm.expectRevert(
-      abi.encodeWithSelector(PriceRegistry.InvalidDestChainConfig.selector, destChainConfigArg.destChainSelector)
+      abi.encodeWithSelector(FeeQuoter.InvalidDestChainConfig.selector, destChainConfigArg.destChainSelector)
     );
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
-  }
-
-  function test_InvalidDestBytesOverhead_Revert() public {
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = _generatePriceRegistryDestChainConfigArgs();
-    PriceRegistry.DestChainConfigArgs memory destChainConfigArg = destChainConfigArgs[0];
-
-    destChainConfigArg.destChainConfig.defaultTokenDestBytesOverhead = uint32(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES - 1);
-
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.InvalidDestChainConfig.selector, DEST_CHAIN_SELECTOR));
-
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
   }
 
   function test_InvalidChainFamilySelector_Revert() public {
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = _generatePriceRegistryDestChainConfigArgs();
-    PriceRegistry.DestChainConfigArgs memory destChainConfigArg = destChainConfigArgs[0];
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
+    FeeQuoter.DestChainConfigArgs memory destChainConfigArg = destChainConfigArgs[0];
 
     destChainConfigArg.destChainConfig.chainFamilySelector = bytes4(uint32(1));
 
     vm.expectRevert(
-      abi.encodeWithSelector(PriceRegistry.InvalidDestChainConfig.selector, destChainConfigArg.destChainSelector)
+      abi.encodeWithSelector(FeeQuoter.InvalidDestChainConfig.selector, destChainConfigArg.destChainSelector)
     );
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
   }
 }
 
-contract PriceRegistry_getDataAvailabilityCost is PriceRegistrySetup {
+contract FeeQuoter_getDataAvailabilityCost is FeeQuoterSetup {
   function test_EmptyMessageCalculatesDataAvailabilityCost_Success() public {
     uint256 dataAvailabilityCostUSD =
-      s_priceRegistry.getDataAvailabilityCost(DEST_CHAIN_SELECTOR, USD_PER_DATA_AVAILABILITY_GAS, 0, 0, 0);
+      s_feeQuoter.getDataAvailabilityCost(DEST_CHAIN_SELECTOR, USD_PER_DATA_AVAILABILITY_GAS, 0, 0, 0);
 
-    PriceRegistry.DestChainConfig memory destChainConfig = s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR);
+    FeeQuoter.DestChainConfig memory destChainConfig = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR);
 
     uint256 dataAvailabilityGas = destChainConfig.destDataAvailabilityOverheadGas
       + destChainConfig.destGasPerDataAvailabilityByte * Internal.ANY_2_EVM_MESSAGE_FIXED_BYTES;
@@ -891,7 +857,7 @@ contract PriceRegistry_getDataAvailabilityCost is PriceRegistrySetup {
     assertEq(expectedDataAvailabilityCostUSD, dataAvailabilityCostUSD);
 
     // Test that the cost is destnation chain specific
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = _generatePriceRegistryDestChainConfigArgs();
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
     destChainConfigArgs[0].destChainSelector = DEST_CHAIN_SELECTOR + 1;
     destChainConfigArgs[0].destChainConfig.destDataAvailabilityOverheadGas =
       destChainConfig.destDataAvailabilityOverheadGas * 2;
@@ -899,11 +865,11 @@ contract PriceRegistry_getDataAvailabilityCost is PriceRegistrySetup {
       destChainConfig.destGasPerDataAvailabilityByte * 2;
     destChainConfigArgs[0].destChainConfig.destDataAvailabilityMultiplierBps =
       destChainConfig.destDataAvailabilityMultiplierBps * 2;
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
 
-    destChainConfig = s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR + 1);
+    destChainConfig = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR + 1);
     uint256 dataAvailabilityCostUSD2 =
-      s_priceRegistry.getDataAvailabilityCost(DEST_CHAIN_SELECTOR + 1, USD_PER_DATA_AVAILABILITY_GAS, 0, 0, 0);
+      s_feeQuoter.getDataAvailabilityCost(DEST_CHAIN_SELECTOR + 1, USD_PER_DATA_AVAILABILITY_GAS, 0, 0, 0);
     dataAvailabilityGas = destChainConfig.destDataAvailabilityOverheadGas
       + destChainConfig.destGasPerDataAvailabilityByte * Internal.ANY_2_EVM_MESSAGE_FIXED_BYTES;
     expectedDataAvailabilityCostUSD =
@@ -915,9 +881,9 @@ contract PriceRegistry_getDataAvailabilityCost is PriceRegistrySetup {
 
   function test_SimpleMessageCalculatesDataAvailabilityCost_Success() public view {
     uint256 dataAvailabilityCostUSD =
-      s_priceRegistry.getDataAvailabilityCost(DEST_CHAIN_SELECTOR, USD_PER_DATA_AVAILABILITY_GAS, 100, 5, 50);
+      s_feeQuoter.getDataAvailabilityCost(DEST_CHAIN_SELECTOR, USD_PER_DATA_AVAILABILITY_GAS, 100, 5, 50);
 
-    PriceRegistry.DestChainConfig memory destChainConfig = s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR);
+    FeeQuoter.DestChainConfig memory destChainConfig = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR);
 
     uint256 dataAvailabilityLengthBytes =
       Internal.ANY_2_EVM_MESSAGE_FIXED_BYTES + 100 + (5 * Internal.ANY_2_EVM_MESSAGE_FIXED_BYTES_PER_TOKEN) + 50;
@@ -930,8 +896,7 @@ contract PriceRegistry_getDataAvailabilityCost is PriceRegistrySetup {
   }
 
   function test_SimpleMessageCalculatesDataAvailabilityCostUnsupportedDestChainSelector_Success() public view {
-    uint256 dataAvailabilityCostUSD =
-      s_priceRegistry.getDataAvailabilityCost(0, USD_PER_DATA_AVAILABILITY_GAS, 100, 5, 50);
+    uint256 dataAvailabilityCostUSD = s_feeQuoter.getDataAvailabilityCost(0, USD_PER_DATA_AVAILABILITY_GAS, 100, 5, 50);
 
     assertEq(dataAvailabilityCostUSD, 0);
   }
@@ -941,7 +906,7 @@ contract PriceRegistry_getDataAvailabilityCost is PriceRegistrySetup {
     uint32 numberOfTokens,
     uint32 tokenTransferBytesOverhead
   ) public view {
-    uint256 dataAvailabilityCostUSD = s_priceRegistry.getDataAvailabilityCost(
+    uint256 dataAvailabilityCostUSD = s_feeQuoter.getDataAvailabilityCost(
       DEST_CHAIN_SELECTOR, 0, messageDataLength, numberOfTokens, tokenTransferBytesOverhead
     );
 
@@ -959,21 +924,20 @@ contract PriceRegistry_getDataAvailabilityCost is PriceRegistrySetup {
     uint32 tokenTransferBytesOverhead
   ) public {
     vm.assume(destChainSelector != 0);
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = new PriceRegistry.DestChainConfigArgs[](1);
-    PriceRegistry.DestChainConfig memory destChainConfig = s_priceRegistry.getDestChainConfig(destChainSelector);
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = new FeeQuoter.DestChainConfigArgs[](1);
+    FeeQuoter.DestChainConfig memory destChainConfig = s_feeQuoter.getDestChainConfig(destChainSelector);
     destChainConfigArgs[0] =
-      PriceRegistry.DestChainConfigArgs({destChainSelector: destChainSelector, destChainConfig: destChainConfig});
+      FeeQuoter.DestChainConfigArgs({destChainSelector: destChainSelector, destChainConfig: destChainConfig});
     destChainConfigArgs[0].destChainConfig.destDataAvailabilityOverheadGas = destDataAvailabilityOverheadGas;
     destChainConfigArgs[0].destChainConfig.destGasPerDataAvailabilityByte = destGasPerDataAvailabilityByte;
     destChainConfigArgs[0].destChainConfig.destDataAvailabilityMultiplierBps = destDataAvailabilityMultiplierBps;
     destChainConfigArgs[0].destChainConfig.defaultTxGasLimit = GAS_LIMIT;
     destChainConfigArgs[0].destChainConfig.maxPerMsgGasLimit = GAS_LIMIT;
     destChainConfigArgs[0].destChainConfig.chainFamilySelector = Internal.CHAIN_FAMILY_SELECTOR_EVM;
-    destChainConfigArgs[0].destChainConfig.defaultTokenDestBytesOverhead = DEFAULT_TOKEN_BYTES_OVERHEAD;
 
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
 
-    uint256 dataAvailabilityCostUSD = s_priceRegistry.getDataAvailabilityCost(
+    uint256 dataAvailabilityCostUSD = s_feeQuoter.getDataAvailabilityCost(
       destChainConfigArgs[0].destChainSelector,
       dataAvailabilityGasPrice,
       messageDataLength,
@@ -993,77 +957,77 @@ contract PriceRegistry_getDataAvailabilityCost is PriceRegistrySetup {
   }
 }
 
-contract PriceRegistry_applyPremiumMultiplierWeiPerEthUpdates is PriceRegistrySetup {
+contract FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates is FeeQuoterSetup {
   function test_Fuzz_applyPremiumMultiplierWeiPerEthUpdates_Success(
-    PriceRegistry.PremiumMultiplierWeiPerEthArgs memory premiumMultiplierWeiPerEthArg
+    FeeQuoter.PremiumMultiplierWeiPerEthArgs memory premiumMultiplierWeiPerEthArg
   ) public {
-    PriceRegistry.PremiumMultiplierWeiPerEthArgs[] memory premiumMultiplierWeiPerEthArgs =
-      new PriceRegistry.PremiumMultiplierWeiPerEthArgs[](1);
+    FeeQuoter.PremiumMultiplierWeiPerEthArgs[] memory premiumMultiplierWeiPerEthArgs =
+      new FeeQuoter.PremiumMultiplierWeiPerEthArgs[](1);
     premiumMultiplierWeiPerEthArgs[0] = premiumMultiplierWeiPerEthArg;
 
     vm.expectEmit();
-    emit PriceRegistry.PremiumMultiplierWeiPerEthUpdated(
+    emit FeeQuoter.PremiumMultiplierWeiPerEthUpdated(
       premiumMultiplierWeiPerEthArg.token, premiumMultiplierWeiPerEthArg.premiumMultiplierWeiPerEth
     );
 
-    s_priceRegistry.applyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs);
+    s_feeQuoter.applyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs);
 
     assertEq(
       premiumMultiplierWeiPerEthArg.premiumMultiplierWeiPerEth,
-      s_priceRegistry.getPremiumMultiplierWeiPerEth(premiumMultiplierWeiPerEthArg.token)
+      s_feeQuoter.getPremiumMultiplierWeiPerEth(premiumMultiplierWeiPerEthArg.token)
     );
   }
 
   function test_applyPremiumMultiplierWeiPerEthUpdatesSingleToken_Success() public {
-    PriceRegistry.PremiumMultiplierWeiPerEthArgs[] memory premiumMultiplierWeiPerEthArgs =
-      new PriceRegistry.PremiumMultiplierWeiPerEthArgs[](1);
-    premiumMultiplierWeiPerEthArgs[0] = s_priceRegistryPremiumMultiplierWeiPerEthArgs[0];
+    FeeQuoter.PremiumMultiplierWeiPerEthArgs[] memory premiumMultiplierWeiPerEthArgs =
+      new FeeQuoter.PremiumMultiplierWeiPerEthArgs[](1);
+    premiumMultiplierWeiPerEthArgs[0] = s_feeQuoterPremiumMultiplierWeiPerEthArgs[0];
     premiumMultiplierWeiPerEthArgs[0].token = vm.addr(1);
 
     vm.expectEmit();
-    emit PriceRegistry.PremiumMultiplierWeiPerEthUpdated(
+    emit FeeQuoter.PremiumMultiplierWeiPerEthUpdated(
       vm.addr(1), premiumMultiplierWeiPerEthArgs[0].premiumMultiplierWeiPerEth
     );
 
-    s_priceRegistry.applyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs);
+    s_feeQuoter.applyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs);
 
     assertEq(
-      s_priceRegistryPremiumMultiplierWeiPerEthArgs[0].premiumMultiplierWeiPerEth,
-      s_priceRegistry.getPremiumMultiplierWeiPerEth(vm.addr(1))
+      s_feeQuoterPremiumMultiplierWeiPerEthArgs[0].premiumMultiplierWeiPerEth,
+      s_feeQuoter.getPremiumMultiplierWeiPerEth(vm.addr(1))
     );
   }
 
   function test_applyPremiumMultiplierWeiPerEthUpdatesMultipleTokens_Success() public {
-    PriceRegistry.PremiumMultiplierWeiPerEthArgs[] memory premiumMultiplierWeiPerEthArgs =
-      new PriceRegistry.PremiumMultiplierWeiPerEthArgs[](2);
-    premiumMultiplierWeiPerEthArgs[0] = s_priceRegistryPremiumMultiplierWeiPerEthArgs[0];
+    FeeQuoter.PremiumMultiplierWeiPerEthArgs[] memory premiumMultiplierWeiPerEthArgs =
+      new FeeQuoter.PremiumMultiplierWeiPerEthArgs[](2);
+    premiumMultiplierWeiPerEthArgs[0] = s_feeQuoterPremiumMultiplierWeiPerEthArgs[0];
     premiumMultiplierWeiPerEthArgs[0].token = vm.addr(1);
     premiumMultiplierWeiPerEthArgs[1].token = vm.addr(2);
 
     vm.expectEmit();
-    emit PriceRegistry.PremiumMultiplierWeiPerEthUpdated(
+    emit FeeQuoter.PremiumMultiplierWeiPerEthUpdated(
       vm.addr(1), premiumMultiplierWeiPerEthArgs[0].premiumMultiplierWeiPerEth
     );
     vm.expectEmit();
-    emit PriceRegistry.PremiumMultiplierWeiPerEthUpdated(
+    emit FeeQuoter.PremiumMultiplierWeiPerEthUpdated(
       vm.addr(2), premiumMultiplierWeiPerEthArgs[1].premiumMultiplierWeiPerEth
     );
 
-    s_priceRegistry.applyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs);
+    s_feeQuoter.applyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs);
 
     assertEq(
       premiumMultiplierWeiPerEthArgs[0].premiumMultiplierWeiPerEth,
-      s_priceRegistry.getPremiumMultiplierWeiPerEth(vm.addr(1))
+      s_feeQuoter.getPremiumMultiplierWeiPerEth(vm.addr(1))
     );
     assertEq(
       premiumMultiplierWeiPerEthArgs[1].premiumMultiplierWeiPerEth,
-      s_priceRegistry.getPremiumMultiplierWeiPerEth(vm.addr(2))
+      s_feeQuoter.getPremiumMultiplierWeiPerEth(vm.addr(2))
     );
   }
 
   function test_applyPremiumMultiplierWeiPerEthUpdatesZeroInput() public {
     vm.recordLogs();
-    s_priceRegistry.applyPremiumMultiplierWeiPerEthUpdates(new PriceRegistry.PremiumMultiplierWeiPerEthArgs[](0));
+    s_feeQuoter.applyPremiumMultiplierWeiPerEthUpdates(new FeeQuoter.PremiumMultiplierWeiPerEthArgs[](0));
 
     assertEq(vm.getRecordedLogs().length, 0);
   }
@@ -1071,21 +1035,20 @@ contract PriceRegistry_applyPremiumMultiplierWeiPerEthUpdates is PriceRegistrySe
   // Reverts
 
   function test_OnlyCallableByOwnerOrAdmin_Revert() public {
-    PriceRegistry.PremiumMultiplierWeiPerEthArgs[] memory premiumMultiplierWeiPerEthArgs;
+    FeeQuoter.PremiumMultiplierWeiPerEthArgs[] memory premiumMultiplierWeiPerEthArgs;
     vm.startPrank(STRANGER);
 
     vm.expectRevert("Only callable by owner");
 
-    s_priceRegistry.applyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs);
+    s_feeQuoter.applyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs);
   }
 }
 
-contract PriceRegistry_applyTokenTransferFeeConfigUpdates is PriceRegistrySetup {
+contract FeeQuoter_applyTokenTransferFeeConfigUpdates is FeeQuoterSetup {
   function test_Fuzz_ApplyTokenTransferFeeConfig_Success(
-    PriceRegistry.TokenTransferFeeConfig[2] memory tokenTransferFeeConfigs
+    FeeQuoter.TokenTransferFeeConfig[2] memory tokenTransferFeeConfigs
   ) public {
-    PriceRegistry.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs =
-      _generateTokenTransferFeeConfigArgs(2, 2);
+    FeeQuoter.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs = _generateTokenTransferFeeConfigArgs(2, 2);
     tokenTransferFeeConfigArgs[0].destChainSelector = DEST_CHAIN_SELECTOR;
     tokenTransferFeeConfigArgs[1].destChainSelector = DEST_CHAIN_SELECTOR + 1;
 
@@ -1099,20 +1062,20 @@ contract PriceRegistry_applyTokenTransferFeeConfigUpdates is PriceRegistrySetup
         tokenTransferFeeConfigArgs[i].tokenTransferFeeConfigs[j].tokenTransferFeeConfig = tokenTransferFeeConfigs[j];
 
         vm.expectEmit();
-        emit PriceRegistry.TokenTransferFeeConfigUpdated(
+        emit FeeQuoter.TokenTransferFeeConfigUpdated(
           tokenTransferFeeConfigArgs[i].destChainSelector, feeToken, tokenTransferFeeConfigs[j]
         );
       }
     }
 
-    s_priceRegistry.applyTokenTransferFeeConfigUpdates(
-      tokenTransferFeeConfigArgs, new PriceRegistry.TokenTransferFeeConfigRemoveArgs[](0)
+    s_feeQuoter.applyTokenTransferFeeConfigUpdates(
+      tokenTransferFeeConfigArgs, new FeeQuoter.TokenTransferFeeConfigRemoveArgs[](0)
     );
 
     for (uint256 i = 0; i < tokenTransferFeeConfigs.length; ++i) {
       _assertTokenTransferFeeConfigEqual(
         tokenTransferFeeConfigs[i],
-        s_priceRegistry.getTokenTransferFeeConfig(
+        s_feeQuoter.getTokenTransferFeeConfig(
           tokenTransferFeeConfigArgs[0].destChainSelector,
           tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[i].token
         )
@@ -1121,12 +1084,10 @@ contract PriceRegistry_applyTokenTransferFeeConfigUpdates is PriceRegistrySetup
   }
 
   function test_ApplyTokenTransferFeeConfig_Success() public {
-    PriceRegistry.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs =
-      _generateTokenTransferFeeConfigArgs(1, 2);
+    FeeQuoter.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs = _generateTokenTransferFeeConfigArgs(1, 2);
     tokenTransferFeeConfigArgs[0].destChainSelector = DEST_CHAIN_SELECTOR;
     tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token = address(5);
-    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig = PriceRegistry
-      .TokenTransferFeeConfig({
+    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig = FeeQuoter.TokenTransferFeeConfig({
       minFeeUSDCents: 6,
       maxFeeUSDCents: 7,
       deciBps: 8,
@@ -1135,8 +1096,7 @@ contract PriceRegistry_applyTokenTransferFeeConfigUpdates is PriceRegistrySetup
       isEnabled: true
     });
     tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[1].token = address(11);
-    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[1].tokenTransferFeeConfig = PriceRegistry
-      .TokenTransferFeeConfig({
+    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[1].tokenTransferFeeConfig = FeeQuoter.TokenTransferFeeConfig({
       minFeeUSDCents: 12,
       maxFeeUSDCents: 13,
       deciBps: 14,
@@ -1146,26 +1106,26 @@ contract PriceRegistry_applyTokenTransferFeeConfigUpdates is PriceRegistrySetup
     });
 
     vm.expectEmit();
-    emit PriceRegistry.TokenTransferFeeConfigUpdated(
+    emit FeeQuoter.TokenTransferFeeConfigUpdated(
       tokenTransferFeeConfigArgs[0].destChainSelector,
       tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token,
       tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig
     );
     vm.expectEmit();
-    emit PriceRegistry.TokenTransferFeeConfigUpdated(
+    emit FeeQuoter.TokenTransferFeeConfigUpdated(
       tokenTransferFeeConfigArgs[0].destChainSelector,
       tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[1].token,
       tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[1].tokenTransferFeeConfig
     );
 
-    PriceRegistry.TokenTransferFeeConfigRemoveArgs[] memory tokensToRemove =
-      new PriceRegistry.TokenTransferFeeConfigRemoveArgs[](0);
-    s_priceRegistry.applyTokenTransferFeeConfigUpdates(tokenTransferFeeConfigArgs, tokensToRemove);
+    FeeQuoter.TokenTransferFeeConfigRemoveArgs[] memory tokensToRemove =
+      new FeeQuoter.TokenTransferFeeConfigRemoveArgs[](0);
+    s_feeQuoter.applyTokenTransferFeeConfigUpdates(tokenTransferFeeConfigArgs, tokensToRemove);
 
-    PriceRegistry.TokenTransferFeeConfig memory config0 = s_priceRegistry.getTokenTransferFeeConfig(
+    FeeQuoter.TokenTransferFeeConfig memory config0 = s_feeQuoter.getTokenTransferFeeConfig(
       tokenTransferFeeConfigArgs[0].destChainSelector, tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token
     );
-    PriceRegistry.TokenTransferFeeConfig memory config1 = s_priceRegistry.getTokenTransferFeeConfig(
+    FeeQuoter.TokenTransferFeeConfig memory config1 = s_feeQuoter.getTokenTransferFeeConfig(
       tokenTransferFeeConfigArgs[0].destChainSelector, tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[1].token
     );
 
@@ -1177,29 +1137,27 @@ contract PriceRegistry_applyTokenTransferFeeConfigUpdates is PriceRegistrySetup
     );
 
     // Remove only the first token and validate only the first token is removed
-    tokensToRemove = new PriceRegistry.TokenTransferFeeConfigRemoveArgs[](1);
-    tokensToRemove[0] = PriceRegistry.TokenTransferFeeConfigRemoveArgs({
+    tokensToRemove = new FeeQuoter.TokenTransferFeeConfigRemoveArgs[](1);
+    tokensToRemove[0] = FeeQuoter.TokenTransferFeeConfigRemoveArgs({
       destChainSelector: tokenTransferFeeConfigArgs[0].destChainSelector,
       token: tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token
     });
 
     vm.expectEmit();
-    emit PriceRegistry.TokenTransferFeeConfigDeleted(
+    emit FeeQuoter.TokenTransferFeeConfigDeleted(
       tokenTransferFeeConfigArgs[0].destChainSelector, tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token
     );
 
-    s_priceRegistry.applyTokenTransferFeeConfigUpdates(
-      new PriceRegistry.TokenTransferFeeConfigArgs[](0), tokensToRemove
-    );
+    s_feeQuoter.applyTokenTransferFeeConfigUpdates(new FeeQuoter.TokenTransferFeeConfigArgs[](0), tokensToRemove);
 
-    config0 = s_priceRegistry.getTokenTransferFeeConfig(
+    config0 = s_feeQuoter.getTokenTransferFeeConfig(
       tokenTransferFeeConfigArgs[0].destChainSelector, tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token
     );
-    config1 = s_priceRegistry.getTokenTransferFeeConfig(
+    config1 = s_feeQuoter.getTokenTransferFeeConfig(
       tokenTransferFeeConfigArgs[0].destChainSelector, tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[1].token
     );
 
-    PriceRegistry.TokenTransferFeeConfig memory emptyConfig;
+    FeeQuoter.TokenTransferFeeConfig memory emptyConfig;
 
     _assertTokenTransferFeeConfigEqual(emptyConfig, config0);
     _assertTokenTransferFeeConfigEqual(
@@ -1209,8 +1167,8 @@ contract PriceRegistry_applyTokenTransferFeeConfigUpdates is PriceRegistrySetup
 
   function test_ApplyTokenTransferFeeZeroInput() public {
     vm.recordLogs();
-    s_priceRegistry.applyTokenTransferFeeConfigUpdates(
-      new PriceRegistry.TokenTransferFeeConfigArgs[](0), new PriceRegistry.TokenTransferFeeConfigRemoveArgs[](0)
+    s_feeQuoter.applyTokenTransferFeeConfigUpdates(
+      new FeeQuoter.TokenTransferFeeConfigArgs[](0), new FeeQuoter.TokenTransferFeeConfigRemoveArgs[](0)
     );
 
     assertEq(vm.getRecordedLogs().length, 0);
@@ -1220,22 +1178,20 @@ contract PriceRegistry_applyTokenTransferFeeConfigUpdates is PriceRegistrySetup
 
   function test_OnlyCallableByOwnerOrAdmin_Revert() public {
     vm.startPrank(STRANGER);
-    PriceRegistry.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs;
+    FeeQuoter.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs;
 
     vm.expectRevert("Only callable by owner");
 
-    s_priceRegistry.applyTokenTransferFeeConfigUpdates(
-      tokenTransferFeeConfigArgs, new PriceRegistry.TokenTransferFeeConfigRemoveArgs[](0)
+    s_feeQuoter.applyTokenTransferFeeConfigUpdates(
+      tokenTransferFeeConfigArgs, new FeeQuoter.TokenTransferFeeConfigRemoveArgs[](0)
     );
   }
 
   function test_InvalidDestBytesOverhead_Revert() public {
-    PriceRegistry.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs =
-      _generateTokenTransferFeeConfigArgs(1, 1);
+    FeeQuoter.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs = _generateTokenTransferFeeConfigArgs(1, 1);
     tokenTransferFeeConfigArgs[0].destChainSelector = DEST_CHAIN_SELECTOR;
     tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token = address(5);
-    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig = PriceRegistry
-      .TokenTransferFeeConfig({
+    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig = FeeQuoter.TokenTransferFeeConfig({
       minFeeUSDCents: 6,
       maxFeeUSDCents: 7,
       deciBps: 8,
@@ -1246,25 +1202,25 @@ contract PriceRegistry_applyTokenTransferFeeConfigUpdates is PriceRegistrySetup
 
     vm.expectRevert(
       abi.encodeWithSelector(
-        PriceRegistry.InvalidDestBytesOverhead.selector,
+        FeeQuoter.InvalidDestBytesOverhead.selector,
         tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token,
         tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig.destBytesOverhead
       )
     );
 
-    s_priceRegistry.applyTokenTransferFeeConfigUpdates(
-      tokenTransferFeeConfigArgs, new PriceRegistry.TokenTransferFeeConfigRemoveArgs[](0)
+    s_feeQuoter.applyTokenTransferFeeConfigUpdates(
+      tokenTransferFeeConfigArgs, new FeeQuoter.TokenTransferFeeConfigRemoveArgs[](0)
     );
   }
 }
 
-contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
+contract FeeQuoter_getTokenTransferCost is FeeQuoterFeeSetup {
   using USDPriceWith18Decimals for uint224;
 
   function test_NoTokenTransferChargesZeroFee_Success() public view {
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     (uint256 feeUSDWei, uint32 destGasOverhead, uint32 destBytesOverhead) =
-      s_priceRegistry.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
 
     assertEq(0, feeUSDWei);
     assertEq(0, destGasOverhead);
@@ -1275,13 +1231,13 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
     Client.EVM2AnyMessage memory message = _generateSingleTokenMessage(s_selfServeTokenDefaultPricing, 1000);
 
     // Get config to assert it isn't set
-    PriceRegistry.TokenTransferFeeConfig memory transferFeeConfig =
-      s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
+    FeeQuoter.TokenTransferFeeConfig memory transferFeeConfig =
+      s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
 
     assertFalse(transferFeeConfig.isEnabled);
 
     (uint256 feeUSDWei, uint32 destGasOverhead, uint32 destBytesOverhead) =
-      s_priceRegistry.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
 
     // Assert that the default values are used
     assertEq(uint256(DEFAULT_TOKEN_FEE_USD_CENTS) * 1e16, feeUSDWei);
@@ -1291,11 +1247,11 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
 
   function test_SmallTokenTransferChargesMinFeeAndGas_Success() public view {
     Client.EVM2AnyMessage memory message = _generateSingleTokenMessage(s_sourceFeeToken, 1000);
-    PriceRegistry.TokenTransferFeeConfig memory transferFeeConfig =
-      s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
+    FeeQuoter.TokenTransferFeeConfig memory transferFeeConfig =
+      s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
 
     (uint256 feeUSDWei, uint32 destGasOverhead, uint32 destBytesOverhead) =
-      s_priceRegistry.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
 
     assertEq(_configUSDCentToWei(transferFeeConfig.minFeeUSDCents), feeUSDWei);
     assertEq(transferFeeConfig.destGasOverhead, destGasOverhead);
@@ -1304,11 +1260,11 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
 
   function test_ZeroAmountTokenTransferChargesMinFeeAndGas_Success() public view {
     Client.EVM2AnyMessage memory message = _generateSingleTokenMessage(s_sourceFeeToken, 0);
-    PriceRegistry.TokenTransferFeeConfig memory transferFeeConfig =
-      s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
+    FeeQuoter.TokenTransferFeeConfig memory transferFeeConfig =
+      s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
 
     (uint256 feeUSDWei, uint32 destGasOverhead, uint32 destBytesOverhead) =
-      s_priceRegistry.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
 
     assertEq(_configUSDCentToWei(transferFeeConfig.minFeeUSDCents), feeUSDWei);
     assertEq(transferFeeConfig.destGasOverhead, destGasOverhead);
@@ -1317,11 +1273,11 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
 
   function test_LargeTokenTransferChargesMaxFeeAndGas_Success() public view {
     Client.EVM2AnyMessage memory message = _generateSingleTokenMessage(s_sourceFeeToken, 1e36);
-    PriceRegistry.TokenTransferFeeConfig memory transferFeeConfig =
-      s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
+    FeeQuoter.TokenTransferFeeConfig memory transferFeeConfig =
+      s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
 
     (uint256 feeUSDWei, uint32 destGasOverhead, uint32 destBytesOverhead) =
-      s_priceRegistry.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
 
     assertEq(_configUSDCentToWei(transferFeeConfig.maxFeeUSDCents), feeUSDWei);
     assertEq(transferFeeConfig.destGasOverhead, destGasOverhead);
@@ -1332,15 +1288,15 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
     uint256 tokenAmount = 10000e18;
 
     Client.EVM2AnyMessage memory message = _generateSingleTokenMessage(s_sourceFeeToken, tokenAmount);
-    PriceRegistry.TokenTransferFeeConfig memory transferFeeConfig =
-      s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
+    FeeQuoter.TokenTransferFeeConfig memory transferFeeConfig =
+      s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
 
     (uint256 feeUSDWei, uint32 destGasOverhead, uint32 destBytesOverhead) =
-      s_priceRegistry.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
 
     uint256 usdWei = _calcUSDValueFromTokenAmount(s_feeTokenPrice, tokenAmount);
     uint256 bpsUSDWei = _applyBpsRatio(
-      usdWei, s_priceRegistryTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig.deciBps
+      usdWei, s_feeQuoterTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig.deciBps
     );
 
     assertEq(bpsUSDWei, feeUSDWei);
@@ -1360,15 +1316,15 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
     });
     message.tokenAmounts[0] = Client.EVMTokenAmount({token: CUSTOM_TOKEN, amount: tokenAmount});
 
-    PriceRegistry.TokenTransferFeeConfig memory transferFeeConfig =
-      s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
+    FeeQuoter.TokenTransferFeeConfig memory transferFeeConfig =
+      s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token);
 
     (uint256 feeUSDWei, uint32 destGasOverhead, uint32 destBytesOverhead) =
-      s_priceRegistry.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
 
     uint256 usdWei = _calcUSDValueFromTokenAmount(s_customTokenPrice, tokenAmount);
     uint256 bpsUSDWei = _applyBpsRatio(
-      usdWei, s_priceRegistryTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[1].tokenTransferFeeConfig.deciBps
+      usdWei, s_feeQuoterTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[1].tokenTransferFeeConfig.deciBps
     );
 
     assertEq(bpsUSDWei, feeUSDWei);
@@ -1377,12 +1333,10 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
   }
 
   function test_ZeroFeeConfigChargesMinFee_Success() public {
-    PriceRegistry.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs =
-      _generateTokenTransferFeeConfigArgs(1, 1);
+    FeeQuoter.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs = _generateTokenTransferFeeConfigArgs(1, 1);
     tokenTransferFeeConfigArgs[0].destChainSelector = DEST_CHAIN_SELECTOR;
     tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token = s_sourceFeeToken;
-    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig = PriceRegistry
-      .TokenTransferFeeConfig({
+    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig = FeeQuoter.TokenTransferFeeConfig({
       minFeeUSDCents: 1,
       maxFeeUSDCents: 0,
       deciBps: 0,
@@ -1390,13 +1344,13 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
       destBytesOverhead: uint32(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES),
       isEnabled: true
     });
-    s_priceRegistry.applyTokenTransferFeeConfigUpdates(
-      tokenTransferFeeConfigArgs, new PriceRegistry.TokenTransferFeeConfigRemoveArgs[](0)
+    s_feeQuoter.applyTokenTransferFeeConfigUpdates(
+      tokenTransferFeeConfigArgs, new FeeQuoter.TokenTransferFeeConfigRemoveArgs[](0)
     );
 
     Client.EVM2AnyMessage memory message = _generateSingleTokenMessage(s_sourceFeeToken, 1e36);
     (uint256 feeUSDWei, uint32 destGasOverhead, uint32 destBytesOverhead) =
-      s_priceRegistry.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_feeTokenPrice, message.tokenAmounts);
 
     // if token charges 0 bps, it should cost minFee to transfer
     assertEq(
@@ -1412,7 +1366,7 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
   function test_Fuzz_TokenTransferFeeDuplicateTokens_Success(uint256 transfers, uint256 amount) public view {
     // It shouldn't be possible to pay materially lower fees by splitting up the transfers.
     // Note it is possible to pay higher fees since the minimum fees are added.
-    PriceRegistry.DestChainConfig memory destChainConfig = s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR);
+    FeeQuoter.DestChainConfig memory destChainConfig = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR);
     transfers = bound(transfers, 1, destChainConfig.maxNumberOfTokensPerMsg);
     // Cap amount to avoid overflow
     amount = bound(amount, 0, 1e36);
@@ -1426,9 +1380,9 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
     address feeToken = s_sourceRouter.getWrappedNative();
 
     (uint256 feeSingleUSDWei, uint32 gasOverheadSingle, uint32 bytesOverheadSingle) =
-      s_priceRegistry.getTokenTransferCost(DEST_CHAIN_SELECTOR, feeToken, s_wrappedTokenPrice, single);
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, feeToken, s_wrappedTokenPrice, single);
     (uint256 feeMultipleUSDWei, uint32 gasOverheadMultiple, uint32 bytesOverheadMultiple) =
-      s_priceRegistry.getTokenTransferCost(DEST_CHAIN_SELECTOR, feeToken, s_wrappedTokenPrice, multiple);
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, feeToken, s_wrappedTokenPrice, multiple);
 
     // Note that there can be a rounding error once per split.
     assertGe(feeMultipleUSDWei, (feeSingleUSDWei - destChainConfig.maxNumberOfTokensPerMsg));
@@ -1439,10 +1393,10 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
   function test_MixedTokenTransferFee_Success() public view {
     address[3] memory testTokens = [s_sourceFeeToken, s_sourceRouter.getWrappedNative(), CUSTOM_TOKEN];
     uint224[3] memory tokenPrices = [s_feeTokenPrice, s_wrappedTokenPrice, s_customTokenPrice];
-    PriceRegistry.TokenTransferFeeConfig[3] memory tokenTransferFeeConfigs = [
-      s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, testTokens[0]),
-      s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, testTokens[1]),
-      s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, testTokens[2])
+    FeeQuoter.TokenTransferFeeConfig[3] memory tokenTransferFeeConfigs = [
+      s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, testTokens[0]),
+      s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, testTokens[1]),
+      s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, testTokens[2])
     ];
 
     Client.EVM2AnyMessage memory message = Client.EVM2AnyMessage({
@@ -1458,8 +1412,8 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
     // Start with small token transfers, total bps fee is lower than min token transfer fee
     for (uint256 i = 0; i < testTokens.length; ++i) {
       message.tokenAmounts[i] = Client.EVMTokenAmount({token: testTokens[i], amount: 1e14});
-      PriceRegistry.TokenTransferFeeConfig memory tokenTransferFeeConfig =
-        s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, testTokens[i]);
+      FeeQuoter.TokenTransferFeeConfig memory tokenTransferFeeConfig =
+        s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, testTokens[i]);
 
       expectedTotalGas += tokenTransferFeeConfig.destGasOverhead == 0
         ? DEFAULT_TOKEN_DEST_GAS_OVERHEAD
@@ -1468,9 +1422,8 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
         ? DEFAULT_TOKEN_BYTES_OVERHEAD
         : tokenTransferFeeConfig.destBytesOverhead;
     }
-    (uint256 feeUSDWei, uint32 destGasOverhead, uint32 destBytesOverhead) = s_priceRegistry.getTokenTransferCost(
-      DEST_CHAIN_SELECTOR, message.feeToken, s_wrappedTokenPrice, message.tokenAmounts
-    );
+    (uint256 feeUSDWei, uint32 destGasOverhead, uint32 destBytesOverhead) =
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_wrappedTokenPrice, message.tokenAmounts);
 
     uint256 expectedFeeUSDWei = 0;
     for (uint256 i = 0; i < testTokens.length; ++i) {
@@ -1493,9 +1446,8 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
     );
     uint256 token1USDWei = _configUSDCentToWei(DEFAULT_TOKEN_FEE_USD_CENTS);
 
-    (feeUSDWei, destGasOverhead, destBytesOverhead) = s_priceRegistry.getTokenTransferCost(
-      DEST_CHAIN_SELECTOR, message.feeToken, s_wrappedTokenPrice, message.tokenAmounts
-    );
+    (feeUSDWei, destGasOverhead, destBytesOverhead) =
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_wrappedTokenPrice, message.tokenAmounts);
     expectedFeeUSDWei = token0USDWei + token1USDWei + _configUSDCentToWei(tokenTransferFeeConfigs[2].minFeeUSDCents);
 
     assertEq(expectedFeeUSDWei, feeUSDWei, "wrong feeUSDWei 2");
@@ -1505,9 +1457,8 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
     // Set 2nd token transfer to a large amount that is higher than maxFeeUSD
     message.tokenAmounts[2] = Client.EVMTokenAmount({token: testTokens[2], amount: 1e36});
 
-    (feeUSDWei, destGasOverhead, destBytesOverhead) = s_priceRegistry.getTokenTransferCost(
-      DEST_CHAIN_SELECTOR, message.feeToken, s_wrappedTokenPrice, message.tokenAmounts
-    );
+    (feeUSDWei, destGasOverhead, destBytesOverhead) =
+      s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, s_wrappedTokenPrice, message.tokenAmounts);
     expectedFeeUSDWei = token0USDWei + token1USDWei + _configUSDCentToWei(tokenTransferFeeConfigs[2].maxFeeUSDCents);
 
     assertEq(expectedFeeUSDWei, feeUSDWei, "wrong feeUSDWei 3");
@@ -1516,7 +1467,7 @@ contract PriceRegistry_getTokenTransferCost is PriceRegistryFeeSetup {
   }
 }
 
-contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
+contract FeeQuoter_getValidatedFee is FeeQuoterFeeSetup {
   using USDPriceWith18Decimals for uint224;
 
   function test_EmptyMessage_Success() public view {
@@ -1526,15 +1477,15 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
     for (uint256 i = 0; i < feeTokenPrices.length; ++i) {
       Client.EVM2AnyMessage memory message = _generateEmptyMessage();
       message.feeToken = testTokens[i];
-      uint64 premiumMultiplierWeiPerEth = s_priceRegistry.getPremiumMultiplierWeiPerEth(message.feeToken);
-      PriceRegistry.DestChainConfig memory destChainConfig = s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR);
+      uint64 premiumMultiplierWeiPerEth = s_feeQuoter.getPremiumMultiplierWeiPerEth(message.feeToken);
+      FeeQuoter.DestChainConfig memory destChainConfig = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR);
 
-      uint256 feeAmount = s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+      uint256 feeAmount = s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
 
       uint256 gasUsed = GAS_LIMIT + DEST_GAS_OVERHEAD;
       uint256 gasFeeUSD = (gasUsed * destChainConfig.gasMultiplierWeiPerEth * USD_PER_GAS);
       uint256 messageFeeUSD = (_configUSDCentToWei(destChainConfig.networkFeeUSDCents) * premiumMultiplierWeiPerEth);
-      uint256 dataAvailabilityFeeUSD = s_priceRegistry.getDataAvailabilityCost(
+      uint256 dataAvailabilityFeeUSD = s_feeQuoter.getDataAvailabilityCost(
         DEST_CHAIN_SELECTOR, USD_PER_DATA_AVAILABILITY_GAS, message.data.length, message.tokenAmounts.length, 0
       );
 
@@ -1544,17 +1495,17 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
   }
 
   function test_ZeroDataAvailabilityMultiplier_Success() public {
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = new PriceRegistry.DestChainConfigArgs[](1);
-    PriceRegistry.DestChainConfig memory destChainConfig = s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR);
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = new FeeQuoter.DestChainConfigArgs[](1);
+    FeeQuoter.DestChainConfig memory destChainConfig = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR);
     destChainConfigArgs[0] =
-      PriceRegistry.DestChainConfigArgs({destChainSelector: DEST_CHAIN_SELECTOR, destChainConfig: destChainConfig});
+      FeeQuoter.DestChainConfigArgs({destChainSelector: DEST_CHAIN_SELECTOR, destChainConfig: destChainConfig});
     destChainConfigArgs[0].destChainConfig.destDataAvailabilityMultiplierBps = 0;
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
 
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
-    uint64 premiumMultiplierWeiPerEth = s_priceRegistry.getPremiumMultiplierWeiPerEth(message.feeToken);
+    uint64 premiumMultiplierWeiPerEth = s_feeQuoter.getPremiumMultiplierWeiPerEth(message.feeToken);
 
-    uint256 feeAmount = s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+    uint256 feeAmount = s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
 
     uint256 gasUsed = GAS_LIMIT + DEST_GAS_OVERHEAD;
     uint256 gasFeeUSD = (gasUsed * destChainConfig.gasMultiplierWeiPerEth * USD_PER_GAS);
@@ -1579,14 +1530,14 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
         extraArgs: Client._argsToBytes(Client.EVMExtraArgsV1({gasLimit: customGasLimit}))
       });
 
-      uint64 premiumMultiplierWeiPerEth = s_priceRegistry.getPremiumMultiplierWeiPerEth(message.feeToken);
-      PriceRegistry.DestChainConfig memory destChainConfig = s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR);
+      uint64 premiumMultiplierWeiPerEth = s_feeQuoter.getPremiumMultiplierWeiPerEth(message.feeToken);
+      FeeQuoter.DestChainConfig memory destChainConfig = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR);
 
-      uint256 feeAmount = s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+      uint256 feeAmount = s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
       uint256 gasUsed = customGasLimit + DEST_GAS_OVERHEAD + customDataSize * DEST_GAS_PER_PAYLOAD_BYTE;
       uint256 gasFeeUSD = (gasUsed * destChainConfig.gasMultiplierWeiPerEth * USD_PER_GAS);
       uint256 messageFeeUSD = (_configUSDCentToWei(destChainConfig.networkFeeUSDCents) * premiumMultiplierWeiPerEth);
-      uint256 dataAvailabilityFeeUSD = s_priceRegistry.getDataAvailabilityCost(
+      uint256 dataAvailabilityFeeUSD = s_feeQuoter.getDataAvailabilityCost(
         DEST_CHAIN_SELECTOR, USD_PER_DATA_AVAILABILITY_GAS, message.data.length, message.tokenAmounts.length, 0
       );
 
@@ -1603,22 +1554,21 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
     for (uint256 i = 0; i < feeTokenPrices.length; ++i) {
       Client.EVM2AnyMessage memory message = _generateSingleTokenMessage(s_sourceFeeToken, tokenAmount);
       message.feeToken = testTokens[i];
-      PriceRegistry.DestChainConfig memory destChainConfig = s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR);
+      FeeQuoter.DestChainConfig memory destChainConfig = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR);
       uint32 destBytesOverhead =
-        s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token).destBytesOverhead;
+        s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token).destBytesOverhead;
       uint32 tokenBytesOverhead =
         destBytesOverhead == 0 ? uint32(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES) : destBytesOverhead;
 
-      uint256 feeAmount = s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+      uint256 feeAmount = s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
 
       uint256 gasUsed = GAS_LIMIT + DEST_GAS_OVERHEAD
-        + s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token).destGasOverhead;
+        + s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[0].token).destGasOverhead;
       uint256 gasFeeUSD = (gasUsed * destChainConfig.gasMultiplierWeiPerEth * USD_PER_GAS);
-      (uint256 transferFeeUSD,,) = s_priceRegistry.getTokenTransferCost(
-        DEST_CHAIN_SELECTOR, message.feeToken, feeTokenPrices[i], message.tokenAmounts
-      );
-      uint256 messageFeeUSD = (transferFeeUSD * s_priceRegistry.getPremiumMultiplierWeiPerEth(message.feeToken));
-      uint256 dataAvailabilityFeeUSD = s_priceRegistry.getDataAvailabilityCost(
+      (uint256 transferFeeUSD,,) =
+        s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, feeTokenPrices[i], message.tokenAmounts);
+      uint256 messageFeeUSD = (transferFeeUSD * s_feeQuoter.getPremiumMultiplierWeiPerEth(message.feeToken));
+      uint256 dataAvailabilityFeeUSD = s_feeQuoter.getDataAvailabilityCost(
         DEST_CHAIN_SELECTOR,
         USD_PER_DATA_AVAILABILITY_GAS,
         message.data.length,
@@ -1644,8 +1594,8 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
         feeToken: testTokens[i],
         extraArgs: Client._argsToBytes(Client.EVMExtraArgsV1({gasLimit: customGasLimit}))
       });
-      uint64 premiumMultiplierWeiPerEth = s_priceRegistry.getPremiumMultiplierWeiPerEth(message.feeToken);
-      PriceRegistry.DestChainConfig memory destChainConfig = s_priceRegistry.getDestChainConfig(DEST_CHAIN_SELECTOR);
+      uint64 premiumMultiplierWeiPerEth = s_feeQuoter.getPremiumMultiplierWeiPerEth(message.feeToken);
+      FeeQuoter.DestChainConfig memory destChainConfig = s_feeQuoter.getDestChainConfig(DEST_CHAIN_SELECTOR);
 
       message.tokenAmounts[0] = Client.EVMTokenAmount({token: s_sourceFeeToken, amount: 10000e18}); // feeTokenAmount
       message.tokenAmounts[1] = Client.EVMTokenAmount({token: CUSTOM_TOKEN, amount: 200000e18}); // customTokenAmount
@@ -1655,21 +1605,19 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
       uint32 tokenBytesOverhead = 0;
       for (uint256 j = 0; j < message.tokenAmounts.length; ++j) {
         tokenGasOverhead +=
-          s_priceRegistry.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[j].token).destGasOverhead;
-        uint32 destBytesOverhead = s_priceRegistry.getTokenTransferFeeConfig(
-          DEST_CHAIN_SELECTOR, message.tokenAmounts[j].token
-        ).destBytesOverhead;
+          s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[j].token).destGasOverhead;
+        uint32 destBytesOverhead =
+          s_feeQuoter.getTokenTransferFeeConfig(DEST_CHAIN_SELECTOR, message.tokenAmounts[j].token).destBytesOverhead;
         tokenBytesOverhead += destBytesOverhead == 0 ? uint32(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES) : destBytesOverhead;
       }
 
       uint256 gasUsed =
         customGasLimit + DEST_GAS_OVERHEAD + message.data.length * DEST_GAS_PER_PAYLOAD_BYTE + tokenGasOverhead;
       uint256 gasFeeUSD = (gasUsed * destChainConfig.gasMultiplierWeiPerEth * USD_PER_GAS);
-      (uint256 transferFeeUSD,,) = s_priceRegistry.getTokenTransferCost(
-        DEST_CHAIN_SELECTOR, message.feeToken, feeTokenPrices[i], message.tokenAmounts
-      );
+      (uint256 transferFeeUSD,,) =
+        s_feeQuoter.getTokenTransferCost(DEST_CHAIN_SELECTOR, message.feeToken, feeTokenPrices[i], message.tokenAmounts);
       uint256 messageFeeUSD = (transferFeeUSD * premiumMultiplierWeiPerEth);
-      uint256 dataAvailabilityFeeUSD = s_priceRegistry.getDataAvailabilityCost(
+      uint256 dataAvailabilityFeeUSD = s_feeQuoter.getDataAvailabilityCost(
         DEST_CHAIN_SELECTOR,
         USD_PER_DATA_AVAILABILITY_GAS,
         message.data.length,
@@ -1678,7 +1626,7 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
       );
 
       uint256 totalPriceInFeeToken = (gasFeeUSD + messageFeeUSD + dataAvailabilityFeeUSD) / feeTokenPrices[i];
-      assertEq(totalPriceInFeeToken, s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message));
+      assertEq(totalPriceInFeeToken, s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message));
     }
   }
 
@@ -1687,9 +1635,9 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
     vm.stopPrank();
     vm.startPrank(OWNER);
 
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = _generatePriceRegistryDestChainConfigArgs();
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
     destChainConfigArgs[0].destChainConfig.enforceOutOfOrder = enforce;
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
 
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     message.extraArgs = abi.encodeWithSelector(
@@ -1699,16 +1647,16 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
 
     // If enforcement is on, only true should be allowed.
     if (enforce && !allowOutOfOrderExecution) {
-      vm.expectRevert(PriceRegistry.ExtraArgOutOfOrderExecutionMustBeTrue.selector);
+      vm.expectRevert(FeeQuoter.ExtraArgOutOfOrderExecutionMustBeTrue.selector);
     }
-    s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+    s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
   }
 
   // Reverts
 
   function test_DestinationChainNotEnabled_Revert() public {
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.DestinationChainNotEnabled.selector, DEST_CHAIN_SELECTOR + 1));
-    s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR + 1, _generateEmptyMessage());
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.DestinationChainNotEnabled.selector, DEST_CHAIN_SELECTOR + 1));
+    s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR + 1, _generateEmptyMessage());
   }
 
   function test_EnforceOutOfOrder_Revert() public {
@@ -1716,41 +1664,41 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
     vm.stopPrank();
     vm.startPrank(OWNER);
 
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = _generatePriceRegistryDestChainConfigArgs();
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
     destChainConfigArgs[0].destChainConfig.enforceOutOfOrder = true;
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
     vm.stopPrank();
 
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     // Empty extraArgs to should revert since it enforceOutOfOrder is true.
     message.extraArgs = "";
 
-    vm.expectRevert(PriceRegistry.ExtraArgOutOfOrderExecutionMustBeTrue.selector);
-    s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+    vm.expectRevert(FeeQuoter.ExtraArgOutOfOrderExecutionMustBeTrue.selector);
+    s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
   }
 
   function test_MessageTooLarge_Revert() public {
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     message.data = new bytes(MAX_DATA_SIZE + 1);
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.MessageTooLarge.selector, MAX_DATA_SIZE, message.data.length));
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.MessageTooLarge.selector, MAX_DATA_SIZE, message.data.length));
 
-    s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+    s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
   }
 
   function test_TooManyTokens_Revert() public {
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     uint256 tooMany = MAX_TOKENS_LENGTH + 1;
     message.tokenAmounts = new Client.EVMTokenAmount[](tooMany);
-    vm.expectRevert(PriceRegistry.UnsupportedNumberOfTokens.selector);
-    s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+    vm.expectRevert(FeeQuoter.UnsupportedNumberOfTokens.selector);
+    s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
   }
 
   // Asserts gasLimit must be <=maxGasLimit
   function test_MessageGasLimitTooHigh_Revert() public {
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     message.extraArgs = Client._argsToBytes(Client.EVMExtraArgsV1({gasLimit: MAX_GAS_LIMIT + 1}));
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.MessageGasLimitTooHigh.selector));
-    s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.MessageGasLimitTooHigh.selector));
+    s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
   }
 
   function test_NotAFeeToken_Revert() public {
@@ -1758,9 +1706,9 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
     Client.EVM2AnyMessage memory message = _generateSingleTokenMessage(notAFeeToken, 1);
     message.feeToken = notAFeeToken;
 
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.TokenNotSupported.selector, notAFeeToken));
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.FeeTokenNotSupported.selector, notAFeeToken));
 
-    s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+    s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
   }
 
   function test_InvalidEVMAddress_Revert() public {
@@ -1769,11 +1717,11 @@ contract PriceRegistry_getValidatedFee is PriceRegistryFeeSetup {
 
     vm.expectRevert(abi.encodeWithSelector(Internal.InvalidEVMAddress.selector, message.receiver));
 
-    s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+    s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
   }
 }
 
-contract PriceRegistry_processMessageArgs is PriceRegistryFeeSetup {
+contract FeeQuoter_processMessageArgs is FeeQuoterFeeSetup {
   using USDPriceWith18Decimals for uint224;
 
   function setUp() public virtual override {
@@ -1786,7 +1734,7 @@ contract PriceRegistry_processMessageArgs is PriceRegistryFeeSetup {
       /* bool isOutOfOrderExecution */
       ,
       /* bytes memory convertedExtraArgs */
-    ) = s_priceRegistry.processMessageArgs(
+    ) = s_feeQuoter.processMessageArgs(
       DEST_CHAIN_SELECTOR,
       // LINK
       s_sourceTokens[0],
@@ -1800,14 +1748,14 @@ contract PriceRegistry_processMessageArgs is PriceRegistryFeeSetup {
   function test_WithConvertedTokenAmount_Success() public view {
     address feeToken = s_sourceTokens[1];
     uint256 feeTokenAmount = 10_000 gwei;
-    uint256 expectedConvertedAmount = s_priceRegistry.convertTokenAmount(feeToken, feeTokenAmount, s_sourceTokens[0]);
+    uint256 expectedConvertedAmount = s_feeQuoter.convertTokenAmount(feeToken, feeTokenAmount, s_sourceTokens[0]);
 
     (
       uint256 msgFeeJuels,
       /* bool isOutOfOrderExecution */
       ,
       /* bytes memory convertedExtraArgs */
-    ) = s_priceRegistry.processMessageArgs(DEST_CHAIN_SELECTOR, feeToken, feeTokenAmount, "");
+    ) = s_feeQuoter.processMessageArgs(DEST_CHAIN_SELECTOR, feeToken, feeTokenAmount, "");
 
     assertEq(msgFeeJuels, expectedConvertedAmount);
   }
@@ -1818,12 +1766,10 @@ contract PriceRegistry_processMessageArgs is PriceRegistryFeeSetup {
       ,
       bool isOutOfOrderExecution,
       bytes memory convertedExtraArgs
-    ) = s_priceRegistry.processMessageArgs(DEST_CHAIN_SELECTOR, s_sourceTokens[0], 0, "");
+    ) = s_feeQuoter.processMessageArgs(DEST_CHAIN_SELECTOR, s_sourceTokens[0], 0, "");
 
     assertEq(isOutOfOrderExecution, false);
-    assertEq(
-      convertedExtraArgs, Client._argsToBytes(s_priceRegistry.parseEVMExtraArgsFromBytes("", DEST_CHAIN_SELECTOR))
-    );
+    assertEq(convertedExtraArgs, Client._argsToBytes(s_feeQuoter.parseEVMExtraArgsFromBytes("", DEST_CHAIN_SELECTOR)));
   }
 
   function test_WithEVMExtraArgsV1_Success() public view {
@@ -1834,12 +1780,11 @@ contract PriceRegistry_processMessageArgs is PriceRegistryFeeSetup {
       ,
       bool isOutOfOrderExecution,
       bytes memory convertedExtraArgs
-    ) = s_priceRegistry.processMessageArgs(DEST_CHAIN_SELECTOR, s_sourceTokens[0], 0, extraArgs);
+    ) = s_feeQuoter.processMessageArgs(DEST_CHAIN_SELECTOR, s_sourceTokens[0], 0, extraArgs);
 
     assertEq(isOutOfOrderExecution, false);
     assertEq(
-      convertedExtraArgs,
-      Client._argsToBytes(s_priceRegistry.parseEVMExtraArgsFromBytes(extraArgs, DEST_CHAIN_SELECTOR))
+      convertedExtraArgs, Client._argsToBytes(s_feeQuoter.parseEVMExtraArgsFromBytes(extraArgs, DEST_CHAIN_SELECTOR))
     );
   }
 
@@ -1851,12 +1796,11 @@ contract PriceRegistry_processMessageArgs is PriceRegistryFeeSetup {
       ,
       bool isOutOfOrderExecution,
       bytes memory convertedExtraArgs
-    ) = s_priceRegistry.processMessageArgs(DEST_CHAIN_SELECTOR, s_sourceTokens[0], 0, extraArgs);
+    ) = s_feeQuoter.processMessageArgs(DEST_CHAIN_SELECTOR, s_sourceTokens[0], 0, extraArgs);
 
     assertEq(isOutOfOrderExecution, true);
     assertEq(
-      convertedExtraArgs,
-      Client._argsToBytes(s_priceRegistry.parseEVMExtraArgsFromBytes(extraArgs, DEST_CHAIN_SELECTOR))
+      convertedExtraArgs, Client._argsToBytes(s_feeQuoter.parseEVMExtraArgsFromBytes(extraArgs, DEST_CHAIN_SELECTOR))
     );
   }
 
@@ -1864,23 +1808,23 @@ contract PriceRegistry_processMessageArgs is PriceRegistryFeeSetup {
 
   function test_MessageFeeTooHigh_Revert() public {
     vm.expectRevert(
-      abi.encodeWithSelector(PriceRegistry.MessageFeeTooHigh.selector, MAX_MSG_FEES_JUELS + 1, MAX_MSG_FEES_JUELS)
+      abi.encodeWithSelector(FeeQuoter.MessageFeeTooHigh.selector, MAX_MSG_FEES_JUELS + 1, MAX_MSG_FEES_JUELS)
     );
 
-    s_priceRegistry.processMessageArgs(DEST_CHAIN_SELECTOR, s_sourceTokens[0], MAX_MSG_FEES_JUELS + 1, "");
+    s_feeQuoter.processMessageArgs(DEST_CHAIN_SELECTOR, s_sourceTokens[0], MAX_MSG_FEES_JUELS + 1, "");
   }
 
   function test_InvalidExtraArgs_Revert() public {
-    vm.expectRevert(PriceRegistry.InvalidExtraArgsTag.selector);
+    vm.expectRevert(FeeQuoter.InvalidExtraArgsTag.selector);
 
-    s_priceRegistry.processMessageArgs(DEST_CHAIN_SELECTOR, s_sourceTokens[0], 0, "abcde");
+    s_feeQuoter.processMessageArgs(DEST_CHAIN_SELECTOR, s_sourceTokens[0], 0, "abcde");
   }
 
   function test_MalformedEVMExtraArgs_Revert() public {
     // abi.decode error
     vm.expectRevert();
 
-    s_priceRegistry.processMessageArgs(
+    s_feeQuoter.processMessageArgs(
       DEST_CHAIN_SELECTOR,
       s_sourceTokens[0],
       0,
@@ -1889,31 +1833,44 @@ contract PriceRegistry_processMessageArgs is PriceRegistryFeeSetup {
   }
 }
 
-contract PriceRegistry_validatePoolReturnData is PriceRegistryFeeSetup {
-  function test_WithSingleToken_Success() public view {
-    Client.EVMTokenAmount[] memory sourceTokenAmounts = new Client.EVMTokenAmount[](1);
+contract FeeQuoter_validatePoolReturnData is FeeQuoterFeeSetup {
+  function test_ProcessPoolReturnData_Success() public view {
+    Client.EVMTokenAmount[] memory sourceTokenAmounts = new Client.EVMTokenAmount[](2);
     sourceTokenAmounts[0].amount = 1e18;
     sourceTokenAmounts[0].token = s_sourceTokens[0];
+    sourceTokenAmounts[1].amount = 1e18;
+    sourceTokenAmounts[1].token = CUSTOM_TOKEN_2;
 
-    Internal.RampTokenAmount[] memory rampTokenAmounts = new Internal.RampTokenAmount[](1);
-    rampTokenAmounts[0] = _getSourceTokenData(sourceTokenAmounts[0], s_tokenAdminRegistry);
+    Internal.RampTokenAmount[] memory rampTokenAmounts = new Internal.RampTokenAmount[](2);
+    rampTokenAmounts[0] = _getSourceTokenData(sourceTokenAmounts[0], s_tokenAdminRegistry, DEST_CHAIN_SELECTOR);
+    rampTokenAmounts[1] = _getSourceTokenData(sourceTokenAmounts[1], s_tokenAdminRegistry, DEST_CHAIN_SELECTOR);
+    bytes[] memory expectedDestExecData = new bytes[](2);
+    expectedDestExecData[0] = abi.encode(
+      s_feeQuoterTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig.destGasOverhead
+    );
+    expectedDestExecData[1] = abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD); //expected return data should be abi.encoded  default as isEnabled is false
 
     // No revert - successful
-    s_priceRegistry.validatePoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
+    bytes[] memory destExecData =
+      s_feeQuoter.processPoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
+
+    for (uint256 i = 0; i < destExecData.length; ++i) {
+      assertEq(destExecData[i], expectedDestExecData[i]);
+    }
   }
 
   function test_TokenAmountArraysMismatching_Revert() public {
-    Client.EVMTokenAmount[] memory sourceTokenAmounts = new Client.EVMTokenAmount[](1);
+    Client.EVMTokenAmount[] memory sourceTokenAmounts = new Client.EVMTokenAmount[](2);
     sourceTokenAmounts[0].amount = 1e18;
     sourceTokenAmounts[0].token = s_sourceTokens[0];
 
     Internal.RampTokenAmount[] memory rampTokenAmounts = new Internal.RampTokenAmount[](1);
-    rampTokenAmounts[0] = _getSourceTokenData(sourceTokenAmounts[0], s_tokenAdminRegistry);
+    rampTokenAmounts[0] = _getSourceTokenData(sourceTokenAmounts[0], s_tokenAdminRegistry, DEST_CHAIN_SELECTOR);
 
     // Revert due to index out of bounds access
     vm.expectRevert();
 
-    s_priceRegistry.validatePoolReturnData(
+    s_feeQuoter.processPoolReturnData(
       DEST_CHAIN_SELECTOR, new Internal.RampTokenAmount[](1), new Client.EVMTokenAmount[](0)
     );
   }
@@ -1926,27 +1883,25 @@ contract PriceRegistry_validatePoolReturnData is PriceRegistryFeeSetup {
     sourceTokenAmounts[0].token = sourceETH;
 
     Internal.RampTokenAmount[] memory rampTokenAmounts = new Internal.RampTokenAmount[](1);
-    rampTokenAmounts[0] = _getSourceTokenData(sourceTokenAmounts[0], s_tokenAdminRegistry);
+    rampTokenAmounts[0] = _getSourceTokenData(sourceTokenAmounts[0], s_tokenAdminRegistry, DEST_CHAIN_SELECTOR);
 
     // No data set, should succeed
-    s_priceRegistry.validatePoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
+    s_feeQuoter.processPoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
 
     // Set max data length, should succeed
     rampTokenAmounts[0].extraData = new bytes(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES);
-    s_priceRegistry.validatePoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
+    s_feeQuoter.processPoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
 
     // Set data to max length +1, should revert
     rampTokenAmounts[0].extraData = new bytes(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES + 1);
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.SourceTokenDataTooLarge.selector, sourceETH));
-    s_priceRegistry.validatePoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.SourceTokenDataTooLarge.selector, sourceETH));
+    s_feeQuoter.processPoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
 
     // Set token config to allow larger data
-    PriceRegistry.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs =
-      _generateTokenTransferFeeConfigArgs(1, 1);
+    FeeQuoter.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs = _generateTokenTransferFeeConfigArgs(1, 1);
     tokenTransferFeeConfigArgs[0].destChainSelector = DEST_CHAIN_SELECTOR;
     tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token = sourceETH;
-    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig = PriceRegistry
-      .TokenTransferFeeConfig({
+    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig = FeeQuoter.TokenTransferFeeConfig({
       minFeeUSDCents: 1,
       maxFeeUSDCents: 0,
       deciBps: 0,
@@ -1954,17 +1909,17 @@ contract PriceRegistry_validatePoolReturnData is PriceRegistryFeeSetup {
       destBytesOverhead: uint32(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES) + 32,
       isEnabled: true
     });
-    s_priceRegistry.applyTokenTransferFeeConfigUpdates(
-      tokenTransferFeeConfigArgs, new PriceRegistry.TokenTransferFeeConfigRemoveArgs[](0)
+    s_feeQuoter.applyTokenTransferFeeConfigUpdates(
+      tokenTransferFeeConfigArgs, new FeeQuoter.TokenTransferFeeConfigRemoveArgs[](0)
     );
 
-    s_priceRegistry.validatePoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
+    s_feeQuoter.processPoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
 
     // Set the token data larger than the configured token data, should revert
     rampTokenAmounts[0].extraData = new bytes(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES + 32 + 1);
 
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.SourceTokenDataTooLarge.selector, sourceETH));
-    s_priceRegistry.validatePoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.SourceTokenDataTooLarge.selector, sourceETH));
+    s_feeQuoter.processPoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
   }
 
   function test_InvalidEVMAddressDestToken_Revert() public {
@@ -1975,22 +1930,22 @@ contract PriceRegistry_validatePoolReturnData is PriceRegistryFeeSetup {
     sourceTokenAmounts[0].token = s_sourceTokens[0];
 
     Internal.RampTokenAmount[] memory rampTokenAmounts = new Internal.RampTokenAmount[](1);
-    rampTokenAmounts[0] = _getSourceTokenData(sourceTokenAmounts[0], s_tokenAdminRegistry);
+    rampTokenAmounts[0] = _getSourceTokenData(sourceTokenAmounts[0], s_tokenAdminRegistry, DEST_CHAIN_SELECTOR);
     rampTokenAmounts[0].destTokenAddress = nonEvmAddress;
 
     vm.expectRevert(abi.encodeWithSelector(Internal.InvalidEVMAddress.selector, nonEvmAddress));
-    s_priceRegistry.validatePoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
+    s_feeQuoter.processPoolReturnData(DEST_CHAIN_SELECTOR, rampTokenAmounts, sourceTokenAmounts);
   }
 }
 
-contract PriceRegistry_validateDestFamilyAddress is PriceRegistrySetup {
+contract FeeQuoter_validateDestFamilyAddress is FeeQuoterSetup {
   function test_ValidEVMAddress_Success() public view {
     bytes memory encodedAddress = abi.encode(address(10000));
-    s_priceRegistry.validateDestFamilyAddress(Internal.CHAIN_FAMILY_SELECTOR_EVM, encodedAddress);
+    s_feeQuoter.validateDestFamilyAddress(Internal.CHAIN_FAMILY_SELECTOR_EVM, encodedAddress);
   }
 
   function test_ValidNonEVMAddress_Success() public view {
-    s_priceRegistry.validateDestFamilyAddress(bytes4(uint32(1)), abi.encode(type(uint208).max));
+    s_feeQuoter.validateDestFamilyAddress(bytes4(uint32(1)), abi.encode(type(uint208).max));
   }
 
   // Reverts
@@ -1998,34 +1953,34 @@ contract PriceRegistry_validateDestFamilyAddress is PriceRegistrySetup {
   function test_InvalidEVMAddress_Revert() public {
     bytes memory invalidAddress = abi.encode(type(uint208).max);
     vm.expectRevert(abi.encodeWithSelector(Internal.InvalidEVMAddress.selector, invalidAddress));
-    s_priceRegistry.validateDestFamilyAddress(Internal.CHAIN_FAMILY_SELECTOR_EVM, invalidAddress);
+    s_feeQuoter.validateDestFamilyAddress(Internal.CHAIN_FAMILY_SELECTOR_EVM, invalidAddress);
   }
 
   function test_InvalidEVMAddressEncodePacked_Revert() public {
     bytes memory invalidAddress = abi.encodePacked(address(234));
     vm.expectRevert(abi.encodeWithSelector(Internal.InvalidEVMAddress.selector, invalidAddress));
-    s_priceRegistry.validateDestFamilyAddress(Internal.CHAIN_FAMILY_SELECTOR_EVM, invalidAddress);
+    s_feeQuoter.validateDestFamilyAddress(Internal.CHAIN_FAMILY_SELECTOR_EVM, invalidAddress);
   }
 
   function test_InvalidEVMAddressPrecompiles_Revert() public {
     for (uint160 i = 0; i < Internal.PRECOMPILE_SPACE; ++i) {
       bytes memory invalidAddress = abi.encode(address(i));
       vm.expectRevert(abi.encodeWithSelector(Internal.InvalidEVMAddress.selector, invalidAddress));
-      s_priceRegistry.validateDestFamilyAddress(Internal.CHAIN_FAMILY_SELECTOR_EVM, invalidAddress);
+      s_feeQuoter.validateDestFamilyAddress(Internal.CHAIN_FAMILY_SELECTOR_EVM, invalidAddress);
     }
 
-    s_priceRegistry.validateDestFamilyAddress(
+    s_feeQuoter.validateDestFamilyAddress(
       Internal.CHAIN_FAMILY_SELECTOR_EVM, abi.encode(address(uint160(Internal.PRECOMPILE_SPACE)))
     );
   }
 }
 
-contract PriceRegistry_parseEVMExtraArgsFromBytes is PriceRegistrySetup {
-  PriceRegistry.DestChainConfig private s_destChainConfig;
+contract FeeQuoter_parseEVMExtraArgsFromBytes is FeeQuoterSetup {
+  FeeQuoter.DestChainConfig private s_destChainConfig;
 
   function setUp() public virtual override {
     super.setUp();
-    s_destChainConfig = _generatePriceRegistryDestChainConfigArgs()[0].destChainConfig;
+    s_destChainConfig = _generateFeeQuoterDestChainConfigArgs()[0].destChainConfig;
   }
 
   function test_EVMExtraArgsV1_Success() public view {
@@ -2035,7 +1990,7 @@ contract PriceRegistry_parseEVMExtraArgsFromBytes is PriceRegistrySetup {
       Client.EVMExtraArgsV2({gasLimit: GAS_LIMIT, allowOutOfOrderExecution: false});
 
     vm.assertEq(
-      abi.encode(s_priceRegistry.parseEVMExtraArgsFromBytes(inputExtraArgs, s_destChainConfig)),
+      abi.encode(s_feeQuoter.parseEVMExtraArgsFromBytes(inputExtraArgs, s_destChainConfig)),
       abi.encode(expectedOutputArgs)
     );
   }
@@ -2046,7 +2001,7 @@ contract PriceRegistry_parseEVMExtraArgsFromBytes is PriceRegistrySetup {
     bytes memory inputExtraArgs = Client._argsToBytes(inputArgs);
 
     vm.assertEq(
-      abi.encode(s_priceRegistry.parseEVMExtraArgsFromBytes(inputExtraArgs, s_destChainConfig)), abi.encode(inputArgs)
+      abi.encode(s_feeQuoter.parseEVMExtraArgsFromBytes(inputExtraArgs, s_destChainConfig)), abi.encode(inputArgs)
     );
   }
 
@@ -2055,7 +2010,7 @@ contract PriceRegistry_parseEVMExtraArgsFromBytes is PriceRegistrySetup {
       Client.EVMExtraArgsV2({gasLimit: s_destChainConfig.defaultTxGasLimit, allowOutOfOrderExecution: false});
 
     vm.assertEq(
-      abi.encode(s_priceRegistry.parseEVMExtraArgsFromBytes("", s_destChainConfig)), abi.encode(expectedOutputArgs)
+      abi.encode(s_feeQuoter.parseEVMExtraArgsFromBytes("", s_destChainConfig)), abi.encode(expectedOutputArgs)
     );
   }
 
@@ -2068,8 +2023,8 @@ contract PriceRegistry_parseEVMExtraArgsFromBytes is PriceRegistrySetup {
     // Invalidate selector
     inputExtraArgs[0] = bytes1(uint8(0));
 
-    vm.expectRevert(PriceRegistry.InvalidExtraArgsTag.selector);
-    s_priceRegistry.parseEVMExtraArgsFromBytes(inputExtraArgs, s_destChainConfig);
+    vm.expectRevert(FeeQuoter.InvalidExtraArgsTag.selector);
+    s_feeQuoter.parseEVMExtraArgsFromBytes(inputExtraArgs, s_destChainConfig);
   }
 
   function test_EVMExtraArgsEnforceOutOfOrder_Revert() public {
@@ -2078,8 +2033,8 @@ contract PriceRegistry_parseEVMExtraArgsFromBytes is PriceRegistrySetup {
     bytes memory inputExtraArgs = Client._argsToBytes(inputArgs);
     s_destChainConfig.enforceOutOfOrder = true;
 
-    vm.expectRevert(PriceRegistry.ExtraArgOutOfOrderExecutionMustBeTrue.selector);
-    s_priceRegistry.parseEVMExtraArgsFromBytes(inputExtraArgs, s_destChainConfig);
+    vm.expectRevert(FeeQuoter.ExtraArgOutOfOrderExecutionMustBeTrue.selector);
+    s_feeQuoter.parseEVMExtraArgsFromBytes(inputExtraArgs, s_destChainConfig);
   }
 
   function test_EVMExtraArgsGasLimitTooHigh_Revert() public {
@@ -2087,18 +2042,18 @@ contract PriceRegistry_parseEVMExtraArgsFromBytes is PriceRegistrySetup {
       Client.EVMExtraArgsV2({gasLimit: s_destChainConfig.maxPerMsgGasLimit + 1, allowOutOfOrderExecution: true});
     bytes memory inputExtraArgs = Client._argsToBytes(inputArgs);
 
-    vm.expectRevert(PriceRegistry.MessageGasLimitTooHigh.selector);
-    s_priceRegistry.parseEVMExtraArgsFromBytes(inputExtraArgs, s_destChainConfig);
+    vm.expectRevert(FeeQuoter.MessageGasLimitTooHigh.selector);
+    s_feeQuoter.parseEVMExtraArgsFromBytes(inputExtraArgs, s_destChainConfig);
   }
 }
 
-contract PriceRegistry_KeystoneSetup is PriceRegistrySetup {
-  address constant FORWARDER_1 = address(0x1);
-  address constant WORKFLOW_OWNER_1 = address(0x3);
-  bytes10 constant WORKFLOW_NAME_1 = "workflow1";
-  bytes2 constant REPORT_NAME_1 = "01";
-  address onReportTestToken1;
-  address onReportTestToken2;
+contract FeeQuoter_KeystoneSetup is FeeQuoterSetup {
+  address internal constant FORWARDER_1 = address(0x1);
+  address internal constant WORKFLOW_OWNER_1 = address(0x3);
+  bytes10 internal constant WORKFLOW_NAME_1 = "workflow1";
+  bytes2 internal constant REPORT_NAME_1 = "01";
+  address internal onReportTestToken1;
+  address internal onReportTestToken2;
 
   function setUp() public virtual override {
     super.setUp();
@@ -2113,57 +2068,54 @@ contract PriceRegistry_KeystoneSetup is PriceRegistrySetup {
       reportName: REPORT_NAME_1,
       isAllowed: true
     });
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeeds = new PriceRegistry.TokenPriceFeedUpdate[](2);
-    tokenPriceFeeds[0] = PriceRegistry.TokenPriceFeedUpdate({
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeeds = new FeeQuoter.TokenPriceFeedUpdate[](2);
+    tokenPriceFeeds[0] = FeeQuoter.TokenPriceFeedUpdate({
       sourceToken: onReportTestToken1,
-      feedConfig: IPriceRegistry.TokenPriceFeedConfig({dataFeedAddress: address(0x0), tokenDecimals: 18})
+      feedConfig: IFeeQuoter.TokenPriceFeedConfig({dataFeedAddress: address(0x0), tokenDecimals: 18})
     });
-    tokenPriceFeeds[1] = PriceRegistry.TokenPriceFeedUpdate({
+    tokenPriceFeeds[1] = FeeQuoter.TokenPriceFeedUpdate({
       sourceToken: onReportTestToken2,
-      feedConfig: IPriceRegistry.TokenPriceFeedConfig({dataFeedAddress: address(0x0), tokenDecimals: 20})
+      feedConfig: IFeeQuoter.TokenPriceFeedConfig({dataFeedAddress: address(0x0), tokenDecimals: 20})
     });
-    s_priceRegistry.setReportPermissions(permissions);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeeds);
+    s_feeQuoter.setReportPermissions(permissions);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeeds);
   }
 }
 
-contract PriceRegistry_onReport is PriceRegistry_KeystoneSetup {
+contract FeeQuoter_onReport is FeeQuoter_KeystoneSetup {
   function test_onReport_Success() public {
     bytes memory encodedPermissionsMetadata =
       abi.encodePacked(keccak256(abi.encode("workflowCID")), WORKFLOW_NAME_1, WORKFLOW_OWNER_1, REPORT_NAME_1);
 
-    PriceRegistry.ReceivedCCIPFeedReport[] memory report = new PriceRegistry.ReceivedCCIPFeedReport[](2);
+    FeeQuoter.ReceivedCCIPFeedReport[] memory report = new FeeQuoter.ReceivedCCIPFeedReport[](2);
     report[0] =
-      PriceRegistry.ReceivedCCIPFeedReport({token: onReportTestToken1, price: 4e18, timestamp: uint32(block.timestamp)});
+      FeeQuoter.ReceivedCCIPFeedReport({token: onReportTestToken1, price: 4e18, timestamp: uint32(block.timestamp)});
     report[1] =
-      PriceRegistry.ReceivedCCIPFeedReport({token: onReportTestToken2, price: 4e18, timestamp: uint32(block.timestamp)});
+      FeeQuoter.ReceivedCCIPFeedReport({token: onReportTestToken2, price: 4e18, timestamp: uint32(block.timestamp)});
 
-    bytes memory encodedReport = abi.encode(report);
-    uint224 expectedStoredToken1Price = s_priceRegistry.calculateRebasedValue(18, 18, report[0].price);
-    uint224 expectedStoredToken2Price = s_priceRegistry.calculateRebasedValue(18, 20, report[1].price);
+    uint224 expectedStoredToken1Price = s_feeQuoter.calculateRebasedValue(18, 18, report[0].price);
+    uint224 expectedStoredToken2Price = s_feeQuoter.calculateRebasedValue(18, 20, report[1].price);
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(onReportTestToken1, expectedStoredToken1Price, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(onReportTestToken1, expectedStoredToken1Price, block.timestamp);
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(onReportTestToken2, expectedStoredToken2Price, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(onReportTestToken2, expectedStoredToken2Price, block.timestamp);
 
     changePrank(FORWARDER_1);
-    s_priceRegistry.onReport(encodedPermissionsMetadata, encodedReport);
+    s_feeQuoter.onReport(encodedPermissionsMetadata, abi.encode(report));
 
-    vm.assertEq(s_priceRegistry.getTokenPrice(report[0].token).value, expectedStoredToken1Price);
-    vm.assertEq(s_priceRegistry.getTokenPrice(report[0].token).timestamp, report[0].timestamp);
+    vm.assertEq(s_feeQuoter.getTokenPrice(report[0].token).value, expectedStoredToken1Price);
+    vm.assertEq(s_feeQuoter.getTokenPrice(report[0].token).timestamp, report[0].timestamp);
 
-    vm.assertEq(s_priceRegistry.getTokenPrice(report[1].token).value, expectedStoredToken2Price);
-    vm.assertEq(s_priceRegistry.getTokenPrice(report[1].token).timestamp, report[1].timestamp);
+    vm.assertEq(s_feeQuoter.getTokenPrice(report[1].token).value, expectedStoredToken2Price);
+    vm.assertEq(s_feeQuoter.getTokenPrice(report[1].token).timestamp, report[1].timestamp);
   }
 
   function test_onReport_InvalidForwarder_Reverts() public {
     bytes memory encodedPermissionsMetadata =
       abi.encodePacked(keccak256(abi.encode("workflowCID")), WORKFLOW_NAME_1, WORKFLOW_OWNER_1, REPORT_NAME_1);
-    PriceRegistry.ReceivedCCIPFeedReport[] memory report = new PriceRegistry.ReceivedCCIPFeedReport[](1);
+    FeeQuoter.ReceivedCCIPFeedReport[] memory report = new FeeQuoter.ReceivedCCIPFeedReport[](1);
     report[0] =
-      PriceRegistry.ReceivedCCIPFeedReport({token: s_sourceTokens[0], price: 4e18, timestamp: uint32(block.timestamp)});
-
-    bytes memory encodedReport = abi.encode(report);
+      FeeQuoter.ReceivedCCIPFeedReport({token: s_sourceTokens[0], price: 4e18, timestamp: uint32(block.timestamp)});
 
     vm.expectRevert(
       abi.encodeWithSelector(
@@ -2175,21 +2127,19 @@ contract PriceRegistry_onReport is PriceRegistry_KeystoneSetup {
       )
     );
     changePrank(STRANGER);
-    s_priceRegistry.onReport(encodedPermissionsMetadata, encodedReport);
+    s_feeQuoter.onReport(encodedPermissionsMetadata, abi.encode(report));
   }
 
   function test_onReport_UnsupportedToken_Reverts() public {
     bytes memory encodedPermissionsMetadata =
       abi.encodePacked(keccak256(abi.encode("workflowCID")), WORKFLOW_NAME_1, WORKFLOW_OWNER_1, REPORT_NAME_1);
-    PriceRegistry.ReceivedCCIPFeedReport[] memory report = new PriceRegistry.ReceivedCCIPFeedReport[](1);
+    FeeQuoter.ReceivedCCIPFeedReport[] memory report = new FeeQuoter.ReceivedCCIPFeedReport[](1);
     report[0] =
-      PriceRegistry.ReceivedCCIPFeedReport({token: s_sourceTokens[1], price: 4e18, timestamp: uint32(block.timestamp)});
-
-    bytes memory encodedReport = abi.encode(report);
+      FeeQuoter.ReceivedCCIPFeedReport({token: s_sourceTokens[1], price: 4e18, timestamp: uint32(block.timestamp)});
 
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.TokenNotSupported.selector, s_sourceTokens[1]));
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.TokenNotSupported.selector, s_sourceTokens[1]));
     changePrank(FORWARDER_1);
-    s_priceRegistry.onReport(encodedPermissionsMetadata, encodedReport);
+    s_feeQuoter.onReport(encodedPermissionsMetadata, abi.encode(report));
   }
 
   function test_OnReport_StaleUpdate_Revert() public {
@@ -2197,33 +2147,28 @@ contract PriceRegistry_onReport is PriceRegistry_KeystoneSetup {
     bytes memory encodedPermissionsMetadata =
       abi.encodePacked(keccak256(abi.encode("workflowCID")), WORKFLOW_NAME_1, WORKFLOW_OWNER_1, REPORT_NAME_1);
 
-    PriceRegistry.ReceivedCCIPFeedReport[] memory report = new PriceRegistry.ReceivedCCIPFeedReport[](1);
+    FeeQuoter.ReceivedCCIPFeedReport[] memory report = new FeeQuoter.ReceivedCCIPFeedReport[](1);
     report[0] =
-      PriceRegistry.ReceivedCCIPFeedReport({token: onReportTestToken1, price: 4e18, timestamp: uint32(block.timestamp)});
+      FeeQuoter.ReceivedCCIPFeedReport({token: onReportTestToken1, price: 4e18, timestamp: uint32(block.timestamp)});
 
-    bytes memory encodedReport = abi.encode(report);
-    uint224 expectedStoredTokenPrice = s_priceRegistry.calculateRebasedValue(18, 18, report[0].price);
+    uint224 expectedStoredTokenPrice = s_feeQuoter.calculateRebasedValue(18, 18, report[0].price);
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(onReportTestToken1, expectedStoredTokenPrice, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(onReportTestToken1, expectedStoredTokenPrice, block.timestamp);
 
     changePrank(FORWARDER_1);
     //setting the correct price and time with the correct report
-    s_priceRegistry.onReport(encodedPermissionsMetadata, encodedReport);
+    s_feeQuoter.onReport(encodedPermissionsMetadata, abi.encode(report));
 
     //create a stale report
-    report[0] = PriceRegistry.ReceivedCCIPFeedReport({
-      token: onReportTestToken1,
-      price: 4e18,
-      timestamp: uint32(block.timestamp - 1)
-    });
-    encodedReport = abi.encode(report);
+    report[0] =
+      FeeQuoter.ReceivedCCIPFeedReport({token: onReportTestToken1, price: 4e18, timestamp: uint32(block.timestamp - 1)});
     //expecting a revert
     vm.expectRevert(
       abi.encodeWithSelector(
-        PriceRegistry.StaleKeystoneUpdate.selector, onReportTestToken1, block.timestamp - 1, block.timestamp
+        FeeQuoter.StaleKeystoneUpdate.selector, onReportTestToken1, block.timestamp - 1, block.timestamp
       )
     );
-    s_priceRegistry.onReport(encodedPermissionsMetadata, encodedReport);
+    s_feeQuoter.onReport(encodedPermissionsMetadata, abi.encode(report));
   }
 }
diff --git a/contracts/src/v0.8/ccip/test/priceRegistry/PriceRegistrySetup.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoterSetup.t.sol
similarity index 71%
rename from contracts/src/v0.8/ccip/test/priceRegistry/PriceRegistrySetup.t.sol
rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoterSetup.t.sol
index 6a4a1e3205..124980bc81 100644
--- a/contracts/src/v0.8/ccip/test/priceRegistry/PriceRegistrySetup.t.sol
+++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoterSetup.t.sol
@@ -1,29 +1,32 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.24;
 
-import {IPriceRegistry} from "../../interfaces/IPriceRegistry.sol";
+import {IFeeQuoter} from "../../interfaces/IFeeQuoter.sol";
 
 import {MockV3Aggregator} from "../../../tests/MockV3Aggregator.sol";
-import {PriceRegistry} from "../../PriceRegistry.sol";
+import {FeeQuoter} from "../../FeeQuoter.sol";
 import {Client} from "../../libraries/Client.sol";
 import {Internal} from "../../libraries/Internal.sol";
 import {TokenAdminRegistry} from "../../tokenAdminRegistry/TokenAdminRegistry.sol";
 import {TokenSetup} from "../TokenSetup.t.sol";
-import {PriceRegistryHelper} from "../helpers/PriceRegistryHelper.sol";
+import {FeeQuoterHelper} from "../helpers/FeeQuoterHelper.sol";
 
-contract PriceRegistrySetup is TokenSetup {
+contract FeeQuoterSetup is TokenSetup {
   uint112 internal constant USD_PER_GAS = 1e6; // 0.001 gwei
   uint112 internal constant USD_PER_DATA_AVAILABILITY_GAS = 1e9; // 1 gwei
 
   address internal constant CUSTOM_TOKEN = address(12345);
+  address internal constant CUSTOM_TOKEN_2 = address(bytes20(keccak256("CUSTOM_TOKEN_2")));
+
   uint224 internal constant CUSTOM_TOKEN_PRICE = 1e17; // $0.1 CUSTOM
+  uint224 internal constant CUSTOM_TOKEN_PRICE_2 = 1e18; // $1 CUSTOM
 
   // Encode L1 gas price and L2 gas price into a packed price.
   // L1 gas price is left-shifted to the higher-order bits.
   uint224 internal constant PACKED_USD_PER_GAS =
     (uint224(USD_PER_DATA_AVAILABILITY_GAS) << Internal.GAS_PRICE_BITS) + USD_PER_GAS;
 
-  PriceRegistryHelper internal s_priceRegistry;
+  FeeQuoterHelper internal s_feeQuoter;
   // Cheat to store the price updates in storage since struct arrays aren't supported.
   bytes internal s_encodedInitialPriceUpdates;
   address internal s_weth;
@@ -33,8 +36,8 @@ contract PriceRegistrySetup is TokenSetup {
   address[] internal s_destFeeTokens;
   uint224[] internal s_destTokenPrices;
 
-  PriceRegistry.PremiumMultiplierWeiPerEthArgs[] internal s_priceRegistryPremiumMultiplierWeiPerEthArgs;
-  PriceRegistry.TokenTransferFeeConfigArgs[] internal s_priceRegistryTokenTransferFeeConfigArgs;
+  FeeQuoter.PremiumMultiplierWeiPerEthArgs[] internal s_feeQuoterPremiumMultiplierWeiPerEthArgs;
+  FeeQuoter.TokenTransferFeeConfigArgs[] internal s_feeQuoterTokenTransferFeeConfigArgs;
 
   mapping(address token => address dataFeedAddress) internal s_dataFeedByToken;
 
@@ -95,27 +98,27 @@ contract PriceRegistrySetup is TokenSetup {
     address[] memory feeTokens = new address[](2);
     feeTokens[0] = s_sourceTokens[0];
     feeTokens[1] = s_weth;
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](0);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](0);
 
-    s_priceRegistryPremiumMultiplierWeiPerEthArgs.push(
-      PriceRegistry.PremiumMultiplierWeiPerEthArgs({
+    s_feeQuoterPremiumMultiplierWeiPerEthArgs.push(
+      FeeQuoter.PremiumMultiplierWeiPerEthArgs({
         token: s_sourceFeeToken,
         premiumMultiplierWeiPerEth: 5e17 // 0.5x
       })
     );
-    s_priceRegistryPremiumMultiplierWeiPerEthArgs.push(
-      PriceRegistry.PremiumMultiplierWeiPerEthArgs({
+    s_feeQuoterPremiumMultiplierWeiPerEthArgs.push(
+      FeeQuoter.PremiumMultiplierWeiPerEthArgs({
         token: s_sourceRouter.getWrappedNative(),
         premiumMultiplierWeiPerEth: 2e18 // 2x
       })
     );
 
-    s_priceRegistryTokenTransferFeeConfigArgs.push();
-    s_priceRegistryTokenTransferFeeConfigArgs[0].destChainSelector = DEST_CHAIN_SELECTOR;
-    s_priceRegistryTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs.push(
-      PriceRegistry.TokenTransferFeeConfigSingleTokenArgs({
+    s_feeQuoterTokenTransferFeeConfigArgs.push();
+    s_feeQuoterTokenTransferFeeConfigArgs[0].destChainSelector = DEST_CHAIN_SELECTOR;
+    s_feeQuoterTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs.push(
+      FeeQuoter.TokenTransferFeeConfigSingleTokenArgs({
         token: s_sourceFeeToken,
-        tokenTransferFeeConfig: PriceRegistry.TokenTransferFeeConfig({
+        tokenTransferFeeConfig: FeeQuoter.TokenTransferFeeConfig({
           minFeeUSDCents: 1_00, // 1 USD
           maxFeeUSDCents: 1000_00, // 1,000 USD
           deciBps: 2_5, // 2.5 bps, or 0.025%
@@ -125,10 +128,10 @@ contract PriceRegistrySetup is TokenSetup {
         })
       })
     );
-    s_priceRegistryTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs.push(
-      PriceRegistry.TokenTransferFeeConfigSingleTokenArgs({
+    s_feeQuoterTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs.push(
+      FeeQuoter.TokenTransferFeeConfigSingleTokenArgs({
         token: CUSTOM_TOKEN,
-        tokenTransferFeeConfig: PriceRegistry.TokenTransferFeeConfig({
+        tokenTransferFeeConfig: FeeQuoter.TokenTransferFeeConfig({
           minFeeUSDCents: 2_00, // 1 USD
           maxFeeUSDCents: 2000_00, // 1,000 USD
           deciBps: 10_0, // 10 bps, or 0.1%
@@ -138,9 +141,25 @@ contract PriceRegistrySetup is TokenSetup {
         })
       })
     );
+    s_feeQuoterTokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs.push(
+      FeeQuoter.TokenTransferFeeConfigSingleTokenArgs({
+        token: CUSTOM_TOKEN_2,
+        tokenTransferFeeConfig: FeeQuoter.TokenTransferFeeConfig({
+          minFeeUSDCents: 2_00, // 1 USD
+          maxFeeUSDCents: 2000_00, // 1,000 USD
+          deciBps: 10_0, // 10 bps, or 0.1%
+          destGasOverhead: 1,
+          destBytesOverhead: 200,
+          isEnabled: false
+        })
+      })
+    );
 
-    s_priceRegistry = new PriceRegistryHelper(
-      PriceRegistry.StaticConfig({
+    //setting up the destination token for CUSTOM_TOKEN_2 here as it is specific to these tests
+    s_destTokenBySourceToken[CUSTOM_TOKEN_2] = address(bytes20(keccak256("CUSTOM_TOKEN_2_DEST")));
+
+    s_feeQuoter = new FeeQuoterHelper(
+      FeeQuoter.StaticConfig({
         linkToken: s_sourceTokens[0],
         maxFeeJuelsPerMsg: MAX_MSG_FEES_JUELS,
         stalenessThreshold: uint32(TWELVE_HOURS)
@@ -148,11 +167,11 @@ contract PriceRegistrySetup is TokenSetup {
       priceUpdaters,
       feeTokens,
       tokenPriceFeedUpdates,
-      s_priceRegistryTokenTransferFeeConfigArgs,
-      s_priceRegistryPremiumMultiplierWeiPerEthArgs,
-      _generatePriceRegistryDestChainConfigArgs()
+      s_feeQuoterTokenTransferFeeConfigArgs,
+      s_feeQuoterPremiumMultiplierWeiPerEthArgs,
+      _generateFeeQuoterDestChainConfigArgs()
     );
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
   }
 
   function _deployTokenPriceDataFeed(address token, uint8 decimals, int256 initialAnswer) internal returns (address) {
@@ -188,43 +207,39 @@ contract PriceRegistrySetup is TokenSetup {
     address sourceToken,
     address dataFeedAddress,
     uint8 tokenDecimals
-  ) internal pure returns (PriceRegistry.TokenPriceFeedUpdate memory) {
-    return PriceRegistry.TokenPriceFeedUpdate({
+  ) internal pure returns (FeeQuoter.TokenPriceFeedUpdate memory) {
+    return FeeQuoter.TokenPriceFeedUpdate({
       sourceToken: sourceToken,
-      feedConfig: IPriceRegistry.TokenPriceFeedConfig({dataFeedAddress: dataFeedAddress, tokenDecimals: tokenDecimals})
+      feedConfig: IFeeQuoter.TokenPriceFeedConfig({dataFeedAddress: dataFeedAddress, tokenDecimals: tokenDecimals})
     });
   }
 
   function _initialiseSingleTokenPriceFeed() internal returns (address) {
-    PriceRegistry.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new PriceRegistry.TokenPriceFeedUpdate[](1);
+    FeeQuoter.TokenPriceFeedUpdate[] memory tokenPriceFeedUpdates = new FeeQuoter.TokenPriceFeedUpdate[](1);
     tokenPriceFeedUpdates[0] =
       _getSingleTokenPriceFeedUpdateStruct(s_sourceTokens[0], s_dataFeedByToken[s_sourceTokens[0]], 18);
-    s_priceRegistry.updateTokenPriceFeeds(tokenPriceFeedUpdates);
+    s_feeQuoter.updateTokenPriceFeeds(tokenPriceFeedUpdates);
     return s_sourceTokens[0];
   }
 
   function _generateTokenTransferFeeConfigArgs(
     uint256 destChainSelectorLength,
     uint256 tokenLength
-  ) internal pure returns (PriceRegistry.TokenTransferFeeConfigArgs[] memory) {
-    PriceRegistry.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs =
-      new PriceRegistry.TokenTransferFeeConfigArgs[](destChainSelectorLength);
+  ) internal pure returns (FeeQuoter.TokenTransferFeeConfigArgs[] memory) {
+    FeeQuoter.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs =
+      new FeeQuoter.TokenTransferFeeConfigArgs[](destChainSelectorLength);
     for (uint256 i = 0; i < destChainSelectorLength; ++i) {
       tokenTransferFeeConfigArgs[i].tokenTransferFeeConfigs =
-        new PriceRegistry.TokenTransferFeeConfigSingleTokenArgs[](tokenLength);
+        new FeeQuoter.TokenTransferFeeConfigSingleTokenArgs[](tokenLength);
     }
     return tokenTransferFeeConfigArgs;
   }
 
-  function _generatePriceRegistryDestChainConfigArgs()
-    internal
-    pure
-    returns (PriceRegistry.DestChainConfigArgs[] memory)
-  {
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigs = new PriceRegistry.DestChainConfigArgs[](1);
-    destChainConfigs[0] = PriceRegistry.DestChainConfigArgs({
+  function _generateFeeQuoterDestChainConfigArgs() internal pure returns (FeeQuoter.DestChainConfigArgs[] memory) {
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigs = new FeeQuoter.DestChainConfigArgs[](1);
+    destChainConfigs[0] = FeeQuoter.DestChainConfigArgs({
       destChainSelector: DEST_CHAIN_SELECTOR,
-      destChainConfig: PriceRegistry.DestChainConfig({
+      destChainConfig: FeeQuoter.DestChainConfig({
         isEnabled: true,
         maxNumberOfTokensPerMsg: MAX_TOKENS_LENGTH,
         destGasOverhead: DEST_GAS_OVERHEAD,
@@ -236,7 +251,6 @@ contract PriceRegistrySetup is TokenSetup {
         maxPerMsgGasLimit: MAX_GAS_LIMIT,
         defaultTokenFeeUSDCents: DEFAULT_TOKEN_FEE_USD_CENTS,
         defaultTokenDestGasOverhead: DEFAULT_TOKEN_DEST_GAS_OVERHEAD,
-        defaultTokenDestBytesOverhead: DEFAULT_TOKEN_BYTES_OVERHEAD,
         defaultTxGasLimit: GAS_LIMIT,
         gasMultiplierWeiPerEth: 5e17,
         networkFeeUSDCents: 1_00,
@@ -248,26 +262,22 @@ contract PriceRegistrySetup is TokenSetup {
   }
 
   function _assertTokenPriceFeedConfigEquality(
-    IPriceRegistry.TokenPriceFeedConfig memory config1,
-    IPriceRegistry.TokenPriceFeedConfig memory config2
+    IFeeQuoter.TokenPriceFeedConfig memory config1,
+    IFeeQuoter.TokenPriceFeedConfig memory config2
   ) internal pure virtual {
     assertEq(config1.dataFeedAddress, config2.dataFeedAddress);
     assertEq(config1.tokenDecimals, config2.tokenDecimals);
   }
 
-  function _assertTokenPriceFeedConfigUnconfigured(IPriceRegistry.TokenPriceFeedConfig memory config)
-    internal
-    pure
-    virtual
-  {
+  function _assertTokenPriceFeedConfigUnconfigured(IFeeQuoter.TokenPriceFeedConfig memory config) internal pure virtual {
     _assertTokenPriceFeedConfigEquality(
-      config, IPriceRegistry.TokenPriceFeedConfig({dataFeedAddress: address(0), tokenDecimals: 0})
+      config, IFeeQuoter.TokenPriceFeedConfig({dataFeedAddress: address(0), tokenDecimals: 0})
     );
   }
 
   function _assertTokenTransferFeeConfigEqual(
-    PriceRegistry.TokenTransferFeeConfig memory a,
-    PriceRegistry.TokenTransferFeeConfig memory b
+    FeeQuoter.TokenTransferFeeConfig memory a,
+    FeeQuoter.TokenTransferFeeConfig memory b
   ) internal pure {
     assertEq(a.minFeeUSDCents, b.minFeeUSDCents);
     assertEq(a.maxFeeUSDCents, b.maxFeeUSDCents);
@@ -277,17 +287,17 @@ contract PriceRegistrySetup is TokenSetup {
     assertEq(a.isEnabled, b.isEnabled);
   }
 
-  function _assertPriceRegistryStaticConfigsEqual(
-    PriceRegistry.StaticConfig memory a,
-    PriceRegistry.StaticConfig memory b
+  function _assertFeeQuoterStaticConfigsEqual(
+    FeeQuoter.StaticConfig memory a,
+    FeeQuoter.StaticConfig memory b
   ) internal pure {
     assertEq(a.linkToken, b.linkToken);
     assertEq(a.maxFeeJuelsPerMsg, b.maxFeeJuelsPerMsg);
   }
 
-  function _assertPriceRegistryDestChainConfigsEqual(
-    PriceRegistry.DestChainConfig memory a,
-    PriceRegistry.DestChainConfig memory b
+  function _assertFeeQuoterDestChainConfigsEqual(
+    FeeQuoter.DestChainConfig memory a,
+    FeeQuoter.DestChainConfig memory b
   ) internal pure {
     assertEq(a.isEnabled, b.isEnabled);
     assertEq(a.maxNumberOfTokensPerMsg, b.maxNumberOfTokensPerMsg);
@@ -300,12 +310,11 @@ contract PriceRegistrySetup is TokenSetup {
     assertEq(a.destDataAvailabilityMultiplierBps, b.destDataAvailabilityMultiplierBps);
     assertEq(a.defaultTokenFeeUSDCents, b.defaultTokenFeeUSDCents);
     assertEq(a.defaultTokenDestGasOverhead, b.defaultTokenDestGasOverhead);
-    assertEq(a.defaultTokenDestBytesOverhead, b.defaultTokenDestBytesOverhead);
     assertEq(a.defaultTxGasLimit, b.defaultTxGasLimit);
   }
 }
 
-contract PriceRegistryFeeSetup is PriceRegistrySetup {
+contract FeeQuoterFeeSetup is FeeQuoterSetup {
   uint224 internal s_feeTokenPrice;
   uint224 internal s_wrappedTokenPrice;
   uint224 internal s_customTokenPrice;
@@ -322,7 +331,7 @@ contract PriceRegistryFeeSetup is PriceRegistrySetup {
     s_wrappedTokenPrice = s_sourceTokenPrices[2];
     s_customTokenPrice = CUSTOM_TOKEN_PRICE;
 
-    s_priceRegistry.updatePrices(_getSingleTokenPriceUpdateStruct(CUSTOM_TOKEN, CUSTOM_TOKEN_PRICE));
+    s_feeQuoter.updatePrices(_getSingleTokenPriceUpdateStruct(CUSTOM_TOKEN, CUSTOM_TOKEN_PRICE));
   }
 
   function _generateEmptyMessage() public view returns (Client.EVM2AnyMessage memory) {
@@ -363,7 +372,7 @@ contract PriceRegistryFeeSetup is PriceRegistrySetup {
     TokenAdminRegistry tokenAdminRegistry
   ) internal view returns (Internal.EVM2AnyRampMessage memory) {
     Client.EVMExtraArgsV2 memory extraArgs =
-      s_priceRegistry.parseEVMExtraArgsFromBytes(message.extraArgs, destChainSelector);
+      s_feeQuoter.parseEVMExtraArgsFromBytes(message.extraArgs, destChainSelector);
 
     Internal.EVM2AnyRampMessage memory messageEvent = Internal.EVM2AnyRampMessage({
       header: Internal.RampMessageHeader({
@@ -383,7 +392,8 @@ contract PriceRegistryFeeSetup is PriceRegistrySetup {
     });
 
     for (uint256 i = 0; i < message.tokenAmounts.length; ++i) {
-      messageEvent.tokenAmounts[i] = _getSourceTokenData(message.tokenAmounts[i], tokenAdminRegistry);
+      messageEvent.tokenAmounts[i] =
+        _getSourceTokenData(message.tokenAmounts[i], tokenAdminRegistry, DEST_CHAIN_SELECTOR);
     }
 
     messageEvent.header.messageId = Internal._hash(messageEvent, metadataHash);
@@ -392,15 +402,23 @@ contract PriceRegistryFeeSetup is PriceRegistrySetup {
 
   function _getSourceTokenData(
     Client.EVMTokenAmount memory tokenAmount,
-    TokenAdminRegistry tokenAdminRegistry
+    TokenAdminRegistry tokenAdminRegistry,
+    uint64 destChainSelector
   ) internal view returns (Internal.RampTokenAmount memory) {
     address destToken = s_destTokenBySourceToken[tokenAmount.token];
 
+    uint32 expectedDestGasAmount;
+    FeeQuoter.TokenTransferFeeConfig memory tokenTransferFeeConfig =
+      FeeQuoter(s_feeQuoter).getTokenTransferFeeConfig(destChainSelector, tokenAmount.token);
+    expectedDestGasAmount =
+      tokenTransferFeeConfig.isEnabled ? tokenTransferFeeConfig.destGasOverhead : DEFAULT_TOKEN_DEST_GAS_OVERHEAD;
+
     return Internal.RampTokenAmount({
       sourcePoolAddress: abi.encode(tokenAdminRegistry.getTokenConfig(tokenAmount.token).tokenPool),
       destTokenAddress: abi.encode(destToken),
       extraData: "",
-      amount: tokenAmount.amount
+      amount: tokenAmount.amount,
+      destExecData: abi.encode(expectedDestGasAmount)
     });
   }
 
diff --git a/contracts/src/v0.8/ccip/test/helpers/BurnMintMultiTokenPool.sol b/contracts/src/v0.8/ccip/test/helpers/BurnMintMultiTokenPool.sol
index ec6f1d2047..bb1d4c9af3 100644
--- a/contracts/src/v0.8/ccip/test/helpers/BurnMintMultiTokenPool.sol
+++ b/contracts/src/v0.8/ccip/test/helpers/BurnMintMultiTokenPool.sol
@@ -18,12 +18,9 @@ contract BurnMintMultiTokenPool is MultiTokenPool {
 
   /// @notice Burn the token in the pool
   /// @dev The _validateLockOrBurn check is an essential security check
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    external
-    virtual
-    override
-    returns (Pool.LockOrBurnOutV1 memory)
-  {
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) external virtual override returns (Pool.LockOrBurnOutV1 memory) {
     _validateLockOrBurn(lockOrBurnIn);
 
     IBurnMintERC20(lockOrBurnIn.localToken).burn(lockOrBurnIn.amount);
@@ -38,12 +35,9 @@ contract BurnMintMultiTokenPool is MultiTokenPool {
 
   /// @notice Mint tokens from the pool to the recipient
   /// @dev The _validateReleaseOrMint check is an essential security check
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    external
-    virtual
-    override
-    returns (Pool.ReleaseOrMintOutV1 memory)
-  {
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) external virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
     _validateReleaseOrMint(releaseOrMintIn);
 
     // Mint to the receiver
diff --git a/contracts/src/v0.8/ccip/test/helpers/CCIPConfigHelper.sol b/contracts/src/v0.8/ccip/test/helpers/CCIPConfigHelper.sol
index 74f03890d3..efade5190b 100644
--- a/contracts/src/v0.8/ccip/test/helpers/CCIPConfigHelper.sol
+++ b/contracts/src/v0.8/ccip/test/helpers/CCIPConfigHelper.sol
@@ -36,7 +36,9 @@ contract CCIPConfigHelper is CCIPConfig {
     return _computeNewConfigWithMeta(donId, currentConfig, newConfig, currentState, newState);
   }
 
-  function groupByPluginType(CCIPConfigTypes.OCR3Config[] memory ocr3Configs)
+  function groupByPluginType(
+    CCIPConfigTypes.OCR3Config[] memory ocr3Configs
+  )
     public
     pure
     returns (CCIPConfigTypes.OCR3Config[] memory commitConfigs, CCIPConfigTypes.OCR3Config[] memory execConfigs)
diff --git a/contracts/src/v0.8/ccip/test/helpers/CCIPReaderTester.sol b/contracts/src/v0.8/ccip/test/helpers/CCIPReaderTester.sol
index 707d38ddf2..c2acddc796 100644
--- a/contracts/src/v0.8/ccip/test/helpers/CCIPReaderTester.sol
+++ b/contracts/src/v0.8/ccip/test/helpers/CCIPReaderTester.sol
@@ -8,6 +8,21 @@ contract CCIPReaderTester {
   event CCIPSendRequested(uint64 indexed destChainSelector, Internal.EVM2AnyRampMessage message);
 
   mapping(uint64 sourceChainSelector => OffRamp.SourceChainConfig sourceChainConfig) internal s_sourceChainConfigs;
+  mapping(uint64 destChainSelector => uint64 sequenceNumber) internal s_destChainSeqNrs;
+
+  /// @notice Gets the next sequence number to be used in the onRamp
+  /// @param destChainSelector The destination chain selector
+  /// @return nextSequenceNumber The next sequence number to be used
+  function getExpectedNextSequenceNumber(uint64 destChainSelector) external view returns (uint64) {
+    return s_destChainSeqNrs[destChainSelector] + 1;
+  }
+
+  /// @notice Sets the sequence number in the onRamp
+  /// @param destChainSelector The destination chain selector
+  /// @param sequenceNumber The sequence number
+  function setDestChainSeqNr(uint64 destChainSelector, uint64 sequenceNumber) external {
+    s_destChainSeqNrs[destChainSelector] = sequenceNumber;
+  }
 
   function getSourceChainConfig(uint64 sourceChainSelector) external view returns (OffRamp.SourceChainConfig memory) {
     return s_sourceChainConfigs[sourceChainSelector];
diff --git a/contracts/src/v0.8/ccip/test/helpers/PriceRegistryHelper.sol b/contracts/src/v0.8/ccip/test/helpers/FeeQuoterHelper.sol
similarity index 95%
rename from contracts/src/v0.8/ccip/test/helpers/PriceRegistryHelper.sol
rename to contracts/src/v0.8/ccip/test/helpers/FeeQuoterHelper.sol
index f939cd3c1f..e392ba0558 100644
--- a/contracts/src/v0.8/ccip/test/helpers/PriceRegistryHelper.sol
+++ b/contracts/src/v0.8/ccip/test/helpers/FeeQuoterHelper.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.24;
 
-import {PriceRegistry} from "../../PriceRegistry.sol";
+import {FeeQuoter} from "../../FeeQuoter.sol";
 import {Client} from "../../libraries/Client.sol";
 
-contract PriceRegistryHelper is PriceRegistry {
+contract FeeQuoterHelper is FeeQuoter {
   constructor(
     StaticConfig memory staticConfig,
     address[] memory priceUpdaters,
@@ -14,7 +14,7 @@ contract PriceRegistryHelper is PriceRegistry {
     PremiumMultiplierWeiPerEthArgs[] memory premiumMultiplierWeiPerEthArgs,
     DestChainConfigArgs[] memory destChainConfigArgs
   )
-    PriceRegistry(
+    FeeQuoter(
       staticConfig,
       priceUpdaters,
       feeTokens,
diff --git a/contracts/src/v0.8/ccip/test/helpers/MaybeRevertingBurnMintTokenPool.sol b/contracts/src/v0.8/ccip/test/helpers/MaybeRevertingBurnMintTokenPool.sol
index b203315bc6..73e764ae03 100644
--- a/contracts/src/v0.8/ccip/test/helpers/MaybeRevertingBurnMintTokenPool.sol
+++ b/contracts/src/v0.8/ccip/test/helpers/MaybeRevertingBurnMintTokenPool.sol
@@ -30,12 +30,9 @@ contract MaybeRevertingBurnMintTokenPool is BurnMintTokenPool {
     s_releaseOrMintMultiplier = multiplier;
   }
 
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    external
-    virtual
-    override
-    returns (Pool.LockOrBurnOutV1 memory)
-  {
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) external virtual override returns (Pool.LockOrBurnOutV1 memory) {
     _validateLockOrBurn(lockOrBurnIn);
 
     bytes memory revertReason = s_revertReason;
@@ -54,12 +51,9 @@ contract MaybeRevertingBurnMintTokenPool is BurnMintTokenPool {
   }
 
   /// @notice Reverts depending on the value of `s_revertReason`
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    external
-    virtual
-    override
-    returns (Pool.ReleaseOrMintOutV1 memory)
-  {
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) external virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
     _validateReleaseOrMint(releaseOrMintIn);
 
     bytes memory revertReason = s_revertReason;
diff --git a/contracts/src/v0.8/ccip/test/helpers/MessageHasher.sol b/contracts/src/v0.8/ccip/test/helpers/MessageHasher.sol
index 19f35df796..d56cf8949a 100644
--- a/contracts/src/v0.8/ccip/test/helpers/MessageHasher.sol
+++ b/contracts/src/v0.8/ccip/test/helpers/MessageHasher.sol
@@ -12,11 +12,9 @@ contract MessageHasher {
     return Internal._hash(message, onRamp);
   }
 
-  function encodeTokenAmountsHashPreimage(Internal.RampTokenAmount[] memory rampTokenAmounts)
-    public
-    pure
-    returns (bytes memory)
-  {
+  function encodeTokenAmountsHashPreimage(
+    Internal.RampTokenAmount[] memory rampTokenAmounts
+  ) public pure returns (bytes memory) {
     return abi.encode(rampTokenAmounts);
   }
 
diff --git a/contracts/src/v0.8/ccip/test/helpers/MultiAggregateRateLimiterHelper.sol b/contracts/src/v0.8/ccip/test/helpers/MultiAggregateRateLimiterHelper.sol
index 2bcaabda33..d011ba0685 100644
--- a/contracts/src/v0.8/ccip/test/helpers/MultiAggregateRateLimiterHelper.sol
+++ b/contracts/src/v0.8/ccip/test/helpers/MultiAggregateRateLimiterHelper.sol
@@ -6,9 +6,9 @@ import {Client} from "../../libraries/Client.sol";
 
 contract MultiAggregateRateLimiterHelper is MultiAggregateRateLimiter {
   constructor(
-    address priceRegistry,
+    address feeQuoter,
     address[] memory authorizedCallers
-  ) MultiAggregateRateLimiter(priceRegistry, authorizedCallers) {}
+  ) MultiAggregateRateLimiter(feeQuoter, authorizedCallers) {}
 
   function getTokenValue(Client.EVMTokenAmount memory tokenAmount) public view returns (uint256) {
     return _getTokenValue(tokenAmount);
diff --git a/contracts/src/v0.8/ccip/test/helpers/TokenPoolHelper.sol b/contracts/src/v0.8/ccip/test/helpers/TokenPoolHelper.sol
index c57bfa3311..4965d1ed2f 100644
--- a/contracts/src/v0.8/ccip/test/helpers/TokenPoolHelper.sol
+++ b/contracts/src/v0.8/ccip/test/helpers/TokenPoolHelper.sol
@@ -14,21 +14,15 @@ contract TokenPoolHelper is TokenPool {
     address router
   ) TokenPool(token, allowlist, rmnProxy, router) {}
 
-  function lockOrBurn(Pool.LockOrBurnInV1 calldata lockOrBurnIn)
-    external
-    view
-    override
-    returns (Pool.LockOrBurnOutV1 memory)
-  {
+  function lockOrBurn(
+    Pool.LockOrBurnInV1 calldata lockOrBurnIn
+  ) external view override returns (Pool.LockOrBurnOutV1 memory) {
     return Pool.LockOrBurnOutV1({destTokenAddress: getRemoteToken(lockOrBurnIn.remoteChainSelector), destPoolData: ""});
   }
 
-  function releaseOrMint(Pool.ReleaseOrMintInV1 calldata releaseOrMintIn)
-    external
-    pure
-    override
-    returns (Pool.ReleaseOrMintOutV1 memory)
-  {
+  function releaseOrMint(
+    Pool.ReleaseOrMintInV1 calldata releaseOrMintIn
+  ) external pure override returns (Pool.ReleaseOrMintOutV1 memory) {
     return Pool.ReleaseOrMintOutV1({destinationAmount: releaseOrMintIn.amount});
   }
 
diff --git a/contracts/src/v0.8/ccip/test/helpers/receivers/ReentrancyAbuser.sol b/contracts/src/v0.8/ccip/test/helpers/receivers/ReentrancyAbuser.sol
index e53df4de1b..b69bbcaa43 100644
--- a/contracts/src/v0.8/ccip/test/helpers/receivers/ReentrancyAbuser.sol
+++ b/contracts/src/v0.8/ccip/test/helpers/receivers/ReentrancyAbuser.sol
@@ -36,11 +36,9 @@ contract ReentrancyAbuser is CCIPReceiver {
     }
   }
 
-  function _getGasLimitsFromMessages(Internal.EVM2EVMMessage[] memory messages)
-    internal
-    pure
-    returns (EVM2EVMOffRamp.GasLimitOverride[] memory)
-  {
+  function _getGasLimitsFromMessages(
+    Internal.EVM2EVMMessage[] memory messages
+  ) internal pure returns (EVM2EVMOffRamp.GasLimitOverride[] memory) {
     EVM2EVMOffRamp.GasLimitOverride[] memory gasLimitOverrides = new EVM2EVMOffRamp.GasLimitOverride[](messages.length);
     for (uint256 i = 0; i < messages.length; ++i) {
       gasLimitOverrides[i].receiverExecutionGasLimit = messages[i].gasLimit;
diff --git a/contracts/src/v0.8/ccip/test/legacy/BurnMintTokenPool1_4.sol b/contracts/src/v0.8/ccip/test/legacy/BurnMintTokenPool1_4.sol
index 9e80438239..168afee4f0 100644
--- a/contracts/src/v0.8/ccip/test/legacy/BurnMintTokenPool1_4.sol
+++ b/contracts/src/v0.8/ccip/test/legacy/BurnMintTokenPool1_4.sol
@@ -211,21 +211,17 @@ abstract contract TokenPool1_4 is IPoolPriorTo1_5, OwnerIsCreator, IERC165 {
 
   /// @notice Gets the token bucket with its values for the block it was requested at.
   /// @return The token bucket.
-  function getCurrentOutboundRateLimiterState(uint64 remoteChainSelector)
-    external
-    view
-    returns (RateLimiter.TokenBucket memory)
-  {
+  function getCurrentOutboundRateLimiterState(
+    uint64 remoteChainSelector
+  ) external view returns (RateLimiter.TokenBucket memory) {
     return s_outboundRateLimits[remoteChainSelector]._currentTokenBucketState();
   }
 
   /// @notice Gets the token bucket with its values for the block it was requested at.
   /// @return The token bucket.
-  function getCurrentInboundRateLimiterState(uint64 remoteChainSelector)
-    external
-    view
-    returns (RateLimiter.TokenBucket memory)
-  {
+  function getCurrentInboundRateLimiterState(
+    uint64 remoteChainSelector
+  ) external view returns (RateLimiter.TokenBucket memory) {
     return s_inboundRateLimits[remoteChainSelector]._currentTokenBucketState();
   }
 
diff --git a/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMOffRamp.t.sol b/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMOffRamp.t.sol
index 6162419367..493d02c7c2 100644
--- a/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMOffRamp.t.sol
+++ b/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMOffRamp.t.sol
@@ -41,7 +41,7 @@ contract EVM2EVMOffRamp_constructor is EVM2EVMOffRampSetup {
       tokenAdminRegistry: address(s_tokenAdminRegistry)
     });
     EVM2EVMOffRamp.DynamicConfig memory dynamicConfig =
-      generateDynamicOffRampConfig(address(s_destRouter), address(s_priceRegistry));
+      generateDynamicOffRampConfig(address(s_destRouter), address(s_feeQuoter));
 
     s_offRamp = new EVM2EVMOffRampHelper(staticConfig, _getInboundRateLimiterConfig());
 
@@ -112,7 +112,7 @@ contract EVM2EVMOffRamp_constructor is EVM2EVMOffRampSetup {
 contract EVM2EVMOffRamp_setDynamicConfig is EVM2EVMOffRampSetup {
   function test_SetDynamicConfig_Success() public {
     EVM2EVMOffRamp.StaticConfig memory staticConfig = s_offRamp.getStaticConfig();
-    EVM2EVMOffRamp.DynamicConfig memory dynamicConfig = generateDynamicOffRampConfig(USER_3, address(s_priceRegistry));
+    EVM2EVMOffRamp.DynamicConfig memory dynamicConfig = generateDynamicOffRampConfig(USER_3, address(s_feeQuoter));
     bytes memory onchainConfig = abi.encode(dynamicConfig);
 
     vm.expectEmit();
@@ -142,7 +142,7 @@ contract EVM2EVMOffRamp_setDynamicConfig is EVM2EVMOffRampSetup {
 
   function test_NonOwner_Revert() public {
     vm.startPrank(STRANGER);
-    EVM2EVMOffRamp.DynamicConfig memory dynamicConfig = generateDynamicOffRampConfig(USER_3, address(s_priceRegistry));
+    EVM2EVMOffRamp.DynamicConfig memory dynamicConfig = generateDynamicOffRampConfig(USER_3, address(s_feeQuoter));
 
     vm.expectRevert("Only callable by owner");
 
@@ -1856,7 +1856,7 @@ contract EVM2EVMOffRamp__releaseOrMintTokens is EVM2EVMOffRampSetup {
     // Set a high price to trip the ARL
     uint224 tokenPrice = 3 ** 128;
     Internal.PriceUpdates memory priceUpdates = _getSingleTokenPriceUpdateStruct(s_destFeeToken, tokenPrice);
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
 
     Client.EVMTokenAmount[] memory srcTokenAmounts = _getCastedSourceEVMTokenAmountsWithZeroAmounts();
     uint256 amount1 = 100;
@@ -2032,7 +2032,7 @@ contract EVM2EVMOffRamp__releaseOrMintTokens is EVM2EVMOffRampSetup {
 
   function test_PriceNotFoundForToken_Reverts() public {
     // Set token price to 0
-    s_priceRegistry.updatePrices(_getSingleTokenPriceUpdateStruct(s_destFeeToken, 0));
+    s_feeQuoter.updatePrices(_getSingleTokenPriceUpdateStruct(s_destFeeToken, 0));
 
     Client.EVMTokenAmount[] memory srcTokenAmounts = _getCastedSourceEVMTokenAmountsWithZeroAmounts();
     uint256 amount1 = 100;
diff --git a/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMOffRampSetup.t.sol b/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMOffRampSetup.t.sol
index a0fa6a4a8e..8399637718 100644
--- a/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMOffRampSetup.t.sol
+++ b/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMOffRampSetup.t.sol
@@ -10,14 +10,15 @@ import {Internal} from "../../libraries/Internal.sol";
 import {EVM2EVMOffRamp} from "../../offRamp/EVM2EVMOffRamp.sol";
 import {TokenPool} from "../../pools/TokenPool.sol";
 import {TokenSetup} from "../TokenSetup.t.sol";
+
+import {FeeQuoterSetup} from "../feeQuoter/FeeQuoterSetup.t.sol";
 import {EVM2EVMOffRampHelper} from "../helpers/EVM2EVMOffRampHelper.sol";
 import {MaybeRevertingBurnMintTokenPool} from "../helpers/MaybeRevertingBurnMintTokenPool.sol";
 import {MaybeRevertMessageReceiver} from "../helpers/receivers/MaybeRevertMessageReceiver.sol";
 import {MockCommitStore} from "../mocks/MockCommitStore.sol";
 import {OCR2BaseSetup} from "../ocr/OCR2Base.t.sol";
-import {PriceRegistrySetup} from "../priceRegistry/PriceRegistrySetup.t.sol";
 
-contract EVM2EVMOffRampSetup is TokenSetup, PriceRegistrySetup, OCR2BaseSetup {
+contract EVM2EVMOffRampSetup is TokenSetup, FeeQuoterSetup, OCR2BaseSetup {
   MockCommitStore internal s_mockCommitStore;
   IAny2EVMMessageReceiver internal s_receiver;
   IAny2EVMMessageReceiver internal s_secondary_receiver;
@@ -28,9 +29,9 @@ contract EVM2EVMOffRampSetup is TokenSetup, PriceRegistrySetup, OCR2BaseSetup {
   EVM2EVMOffRampHelper internal s_offRamp;
   address internal s_sourceTokenPool = makeAddr("sourceTokenPool");
 
-  function setUp() public virtual override(TokenSetup, PriceRegistrySetup, OCR2BaseSetup) {
+  function setUp() public virtual override(TokenSetup, FeeQuoterSetup, OCR2BaseSetup) {
     TokenSetup.setUp();
-    PriceRegistrySetup.setUp();
+    FeeQuoterSetup.setUp();
     OCR2BaseSetup.setUp();
 
     s_mockCommitStore = new MockCommitStore();
@@ -60,7 +61,7 @@ contract EVM2EVMOffRampSetup is TokenSetup, PriceRegistrySetup, OCR2BaseSetup {
       s_valid_signers,
       s_valid_transmitters,
       s_f,
-      abi.encode(generateDynamicOffRampConfig(address(router), address(s_priceRegistry))),
+      abi.encode(generateDynamicOffRampConfig(address(router), address(s_feeQuoter))),
       s_offchainConfigVersion,
       abi.encode("")
     );
@@ -90,11 +91,9 @@ contract EVM2EVMOffRampSetup is TokenSetup, PriceRegistrySetup, OCR2BaseSetup {
     });
   }
 
-  function _convertToGeneralMessage(Internal.EVM2EVMMessage memory original)
-    internal
-    view
-    returns (Client.Any2EVMMessage memory message)
-  {
+  function _convertToGeneralMessage(
+    Internal.EVM2EVMMessage memory original
+  ) internal view returns (Client.Any2EVMMessage memory message) {
     uint256 numberOfTokens = original.tokenAmounts.length;
     Client.EVMTokenAmount[] memory destTokenAmounts = new Client.EVMTokenAmount[](numberOfTokens);
 
@@ -117,11 +116,9 @@ contract EVM2EVMOffRampSetup is TokenSetup, PriceRegistrySetup, OCR2BaseSetup {
     });
   }
 
-  function _generateAny2EVMMessageNoTokens(uint64 sequenceNumber)
-    internal
-    view
-    returns (Internal.EVM2EVMMessage memory)
-  {
+  function _generateAny2EVMMessageNoTokens(
+    uint64 sequenceNumber
+  ) internal view returns (Internal.EVM2EVMMessage memory) {
     return _generateAny2EVMMessage(sequenceNumber, new Client.EVMTokenAmount[](0), false);
   }
 
@@ -205,11 +202,9 @@ contract EVM2EVMOffRampSetup is TokenSetup, PriceRegistrySetup, OCR2BaseSetup {
     return messages;
   }
 
-  function _generateReportFromMessages(Internal.EVM2EVMMessage[] memory messages)
-    internal
-    pure
-    returns (Internal.ExecutionReport memory)
-  {
+  function _generateReportFromMessages(
+    Internal.EVM2EVMMessage[] memory messages
+  ) internal pure returns (Internal.ExecutionReport memory) {
     bytes[][] memory offchainTokenData = new bytes[][](messages.length);
 
     for (uint256 i = 0; i < messages.length; ++i) {
@@ -224,11 +219,9 @@ contract EVM2EVMOffRampSetup is TokenSetup, PriceRegistrySetup, OCR2BaseSetup {
     });
   }
 
-  function _getGasLimitsFromMessages(Internal.EVM2EVMMessage[] memory messages)
-    internal
-    pure
-    returns (EVM2EVMOffRamp.GasLimitOverride[] memory)
-  {
+  function _getGasLimitsFromMessages(
+    Internal.EVM2EVMMessage[] memory messages
+  ) internal pure returns (EVM2EVMOffRamp.GasLimitOverride[] memory) {
     EVM2EVMOffRamp.GasLimitOverride[] memory gasLimitOverrides = new EVM2EVMOffRamp.GasLimitOverride[](messages.length);
     for (uint256 i = 0; i < messages.length; ++i) {
       gasLimitOverrides[i].receiverExecutionGasLimit = messages[i].gasLimit;
@@ -250,11 +243,9 @@ contract EVM2EVMOffRampSetup is TokenSetup, PriceRegistrySetup, OCR2BaseSetup {
     assertEq(a.maxDataBytes, b.maxDataBytes);
   }
 
-  function _getDefaultSourceTokenData(Client.EVMTokenAmount[] memory srcTokenAmounts)
-    internal
-    view
-    returns (bytes[] memory)
-  {
+  function _getDefaultSourceTokenData(
+    Client.EVMTokenAmount[] memory srcTokenAmounts
+  ) internal view returns (bytes[] memory) {
     bytes[] memory sourceTokenData = new bytes[](srcTokenAmounts.length);
     for (uint256 i = 0; i < srcTokenAmounts.length; ++i) {
       sourceTokenData[i] = abi.encode(
diff --git a/contracts/src/v0.8/ccip/test/offRamp/OffRamp.t.sol b/contracts/src/v0.8/ccip/test/offRamp/OffRamp.t.sol
index 70e5689679..ec8ac65008 100644
--- a/contracts/src/v0.8/ccip/test/offRamp/OffRamp.t.sol
+++ b/contracts/src/v0.8/ccip/test/offRamp/OffRamp.t.sol
@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.24;
 
+import {IFeeQuoter} from "../../interfaces/IFeeQuoter.sol";
 import {IMessageInterceptor} from "../../interfaces/IMessageInterceptor.sol";
-import {IPriceRegistry} from "../../interfaces/IPriceRegistry.sol";
 import {IRMN} from "../../interfaces/IRMN.sol";
 import {IRouter} from "../../interfaces/IRouter.sol";
 import {ITokenAdminRegistry} from "../../interfaces/ITokenAdminRegistry.sol";
 
 import {CallWithExactGas} from "../../../shared/call/CallWithExactGas.sol";
+import {FeeQuoter} from "../../FeeQuoter.sol";
 import {NonceManager} from "../../NonceManager.sol";
-import {PriceRegistry} from "../../PriceRegistry.sol";
 import {Client} from "../../libraries/Client.sol";
 import {Internal} from "../../libraries/Internal.sol";
 import {MerkleMultiProof} from "../../libraries/MerkleMultiProof.sol";
@@ -38,7 +38,7 @@ contract OffRamp_constructor is OffRampSetup {
       tokenAdminRegistry: address(s_tokenAdminRegistry),
       nonceManager: address(s_inboundNonceManager)
     });
-    OffRamp.DynamicConfig memory dynamicConfig = _generateDynamicOffRampConfig(address(s_priceRegistry));
+    OffRamp.DynamicConfig memory dynamicConfig = _generateDynamicOffRampConfig(address(s_feeQuoter));
 
     OffRamp.SourceChainConfigArgs[] memory sourceChainConfigs = new OffRamp.SourceChainConfigArgs[](2);
     sourceChainConfigs[0] = OffRamp.SourceChainConfigArgs({
@@ -159,7 +159,7 @@ contract OffRamp_constructor is OffRampSetup {
         tokenAdminRegistry: address(s_tokenAdminRegistry),
         nonceManager: address(s_inboundNonceManager)
       }),
-      _generateDynamicOffRampConfig(address(s_priceRegistry)),
+      _generateDynamicOffRampConfig(address(s_feeQuoter)),
       sourceChainConfigs
     );
   }
@@ -185,7 +185,7 @@ contract OffRamp_constructor is OffRampSetup {
         tokenAdminRegistry: address(s_tokenAdminRegistry),
         nonceManager: address(s_inboundNonceManager)
       }),
-      _generateDynamicOffRampConfig(address(s_priceRegistry)),
+      _generateDynamicOffRampConfig(address(s_feeQuoter)),
       sourceChainConfigs
     );
   }
@@ -205,7 +205,7 @@ contract OffRamp_constructor is OffRampSetup {
         tokenAdminRegistry: address(s_tokenAdminRegistry),
         nonceManager: address(s_inboundNonceManager)
       }),
-      _generateDynamicOffRampConfig(address(s_priceRegistry)),
+      _generateDynamicOffRampConfig(address(s_feeQuoter)),
       sourceChainConfigs
     );
   }
@@ -225,7 +225,7 @@ contract OffRamp_constructor is OffRampSetup {
         tokenAdminRegistry: address(s_tokenAdminRegistry),
         nonceManager: address(s_inboundNonceManager)
       }),
-      _generateDynamicOffRampConfig(address(s_priceRegistry)),
+      _generateDynamicOffRampConfig(address(s_feeQuoter)),
       sourceChainConfigs
     );
   }
@@ -245,7 +245,7 @@ contract OffRamp_constructor is OffRampSetup {
         tokenAdminRegistry: ZERO_ADDRESS,
         nonceManager: address(s_inboundNonceManager)
       }),
-      _generateDynamicOffRampConfig(address(s_priceRegistry)),
+      _generateDynamicOffRampConfig(address(s_feeQuoter)),
       sourceChainConfigs
     );
   }
@@ -265,7 +265,7 @@ contract OffRamp_constructor is OffRampSetup {
         tokenAdminRegistry: address(s_tokenAdminRegistry),
         nonceManager: ZERO_ADDRESS
       }),
-      _generateDynamicOffRampConfig(address(s_priceRegistry)),
+      _generateDynamicOffRampConfig(address(s_feeQuoter)),
       sourceChainConfigs
     );
   }
@@ -273,7 +273,7 @@ contract OffRamp_constructor is OffRampSetup {
 
 contract OffRamp_setDynamicConfig is OffRampSetup {
   function test_SetDynamicConfig_Success() public {
-    OffRamp.DynamicConfig memory dynamicConfig = _generateDynamicOffRampConfig(address(s_priceRegistry));
+    OffRamp.DynamicConfig memory dynamicConfig = _generateDynamicOffRampConfig(address(s_feeQuoter));
 
     vm.expectEmit();
     emit OffRamp.DynamicConfigSet(dynamicConfig);
@@ -285,7 +285,7 @@ contract OffRamp_setDynamicConfig is OffRampSetup {
   }
 
   function test_SetDynamicConfigWithValidator_Success() public {
-    OffRamp.DynamicConfig memory dynamicConfig = _generateDynamicOffRampConfig(address(s_priceRegistry));
+    OffRamp.DynamicConfig memory dynamicConfig = _generateDynamicOffRampConfig(address(s_feeQuoter));
     dynamicConfig.messageValidator = address(s_inboundMessageValidator);
 
     vm.expectEmit();
@@ -301,14 +301,14 @@ contract OffRamp_setDynamicConfig is OffRampSetup {
 
   function test_NonOwner_Revert() public {
     vm.startPrank(STRANGER);
-    OffRamp.DynamicConfig memory dynamicConfig = _generateDynamicOffRampConfig(address(s_priceRegistry));
+    OffRamp.DynamicConfig memory dynamicConfig = _generateDynamicOffRampConfig(address(s_feeQuoter));
 
     vm.expectRevert("Only callable by owner");
 
     s_offRamp.setDynamicConfig(dynamicConfig);
   }
 
-  function test_PriceRegistryZeroAddress_Revert() public {
+  function test_FeeQuoterZeroAddress_Revert() public {
     OffRamp.DynamicConfig memory dynamicConfig = _generateDynamicOffRampConfig(ZERO_ADDRESS);
 
     vm.expectRevert(OffRamp.ZeroAddressNotAllowed.selector);
@@ -346,6 +346,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -361,6 +362,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -381,6 +383,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -402,6 +405,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -455,6 +459,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.FAILURE,
       abi.encodeWithSelector(
         OffRamp.ReceiverError.selector,
@@ -495,6 +500,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -510,6 +516,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -532,6 +539,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -557,6 +565,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -576,6 +585,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -598,6 +608,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -606,6 +617,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[1].header.sequenceNumber,
       messages[1].header.messageId,
+      Internal._hash(messages[1], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -628,6 +640,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -635,6 +648,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[1].header.sequenceNumber,
       messages[1].header.messageId,
+      Internal._hash(messages[1], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -676,6 +690,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
         SOURCE_CHAIN_SELECTOR_1,
         messages[i].header.sequenceNumber,
         messages[i].header.messageId,
+        Internal._hash(messages[i], ON_RAMP_ADDRESS_1),
         Internal.MessageExecutionState.SUCCESS,
         ""
       );
@@ -702,6 +717,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.FAILURE,
       abi.encodeWithSelector(
         OffRamp.TokenHandlingError.selector,
@@ -891,6 +907,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.FAILURE,
       abi.encodeWithSelector(CallWithExactGas.NotEnoughGasForCall.selector)
     );
@@ -914,6 +931,7 @@ contract OffRamp_executeSingleReport is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.FAILURE,
       abi.encodeWithSelector(
         OffRamp.ReceiverError.selector,
@@ -1108,6 +1126,7 @@ contract OffRamp_batchExecute is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1134,6 +1153,7 @@ contract OffRamp_batchExecute is OffRampSetup {
       messages1[0].header.sourceChainSelector,
       messages1[0].header.sequenceNumber,
       messages1[0].header.messageId,
+      Internal._hash(messages1[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1142,6 +1162,7 @@ contract OffRamp_batchExecute is OffRampSetup {
       messages1[1].header.sourceChainSelector,
       messages1[1].header.sequenceNumber,
       messages1[1].header.messageId,
+      Internal._hash(messages1[1], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1150,6 +1171,7 @@ contract OffRamp_batchExecute is OffRampSetup {
       messages2[0].header.sourceChainSelector,
       messages2[0].header.sequenceNumber,
       messages2[0].header.messageId,
+      Internal._hash(messages2[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1177,6 +1199,7 @@ contract OffRamp_batchExecute is OffRampSetup {
       messages1[0].header.sourceChainSelector,
       messages1[0].header.sequenceNumber,
       messages1[0].header.messageId,
+      Internal._hash(messages1[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1185,6 +1208,7 @@ contract OffRamp_batchExecute is OffRampSetup {
       messages1[1].header.sourceChainSelector,
       messages1[1].header.sequenceNumber,
       messages1[1].header.messageId,
+      Internal._hash(messages1[1], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1193,6 +1217,7 @@ contract OffRamp_batchExecute is OffRampSetup {
       messages2[0].header.sourceChainSelector,
       messages2[0].header.sequenceNumber,
       messages2[0].header.messageId,
+      Internal._hash(messages2[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1222,6 +1247,7 @@ contract OffRamp_batchExecute is OffRampSetup {
       messages[0].header.sourceChainSelector,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1294,6 +1320,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1307,16 +1334,17 @@ contract OffRamp_manuallyExecute is OffRampSetup {
     s_offRamp.batchExecute(_generateBatchReportFromMessages(SOURCE_CHAIN_SELECTOR_1, messages), new uint256[][](1));
 
     s_reverting_receiver.setRevert(false);
+
     uint256[][] memory gasLimitOverrides = new uint256[][](1);
     gasLimitOverrides[0] = _getGasLimitsFromMessages(messages);
     gasLimitOverrides[0][0] += 1;
-
+    vm.recordLogs();
     s_offRamp.manuallyExecute(_generateBatchReportFromMessages(SOURCE_CHAIN_SELECTOR_1, messages), gasLimitOverrides);
-
     assertExecutionStateChangedEventLogs(
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1343,6 +1371,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.FAILURE,
       abi.encodeWithSelector(
         OffRamp.ReceiverError.selector, abi.encodeWithSelector(MaybeRevertMessageReceiver.CustomError.selector, "")
@@ -1397,6 +1426,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
         SOURCE_CHAIN_SELECTOR_1,
         messages1[j].header.sequenceNumber,
         messages1[j].header.messageId,
+        Internal._hash(messages1[j], ON_RAMP_ADDRESS_1),
         Internal.MessageExecutionState.SUCCESS,
         ""
       );
@@ -1407,6 +1437,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
         SOURCE_CHAIN_SELECTOR_1,
         messages2[k].header.sequenceNumber,
         messages2[k].header.messageId,
+        Internal._hash(messages2[k], ON_RAMP_ADDRESS_1),
         Internal.MessageExecutionState.SUCCESS,
         ""
       );
@@ -1430,6 +1461,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1438,6 +1470,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[1].header.sequenceNumber,
       messages[1].header.messageId,
+      Internal._hash(messages[1], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.FAILURE,
       abi.encodeWithSelector(
         OffRamp.ReceiverError.selector,
@@ -1449,6 +1482,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[2].header.sequenceNumber,
       messages[2].header.messageId,
+      Internal._hash(messages[2], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1469,6 +1503,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1487,6 +1522,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.FAILURE,
       abi.encodeWithSelector(OffRamp.ReceiverError.selector, "")
     );
@@ -1504,6 +1540,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1664,7 +1701,8 @@ contract OffRamp_manuallyExecute is OffRampSetup {
       sourcePoolAddress: abi.encode(s_sourcePoolByToken[s_sourceFeeToken]),
       destTokenAddress: abi.encode(s_destTokenBySourceToken[s_sourceFeeToken]),
       extraData: "",
-      amount: tokenAmount
+      amount: tokenAmount,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     messages[0].receiver = address(receiver);
@@ -1692,6 +1730,7 @@ contract OffRamp_manuallyExecute is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1728,6 +1767,7 @@ contract OffRamp_execute is OffRampSetup {
       SOURCE_CHAIN_SELECTOR_1,
       messages[0].header.sequenceNumber,
       messages[0].header.messageId,
+      Internal._hash(messages[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1756,6 +1796,7 @@ contract OffRamp_execute is OffRampSetup {
       messages1[0].header.sourceChainSelector,
       messages1[0].header.sequenceNumber,
       messages1[0].header.messageId,
+      Internal._hash(messages1[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1764,6 +1805,7 @@ contract OffRamp_execute is OffRampSetup {
       messages1[1].header.sourceChainSelector,
       messages1[1].header.sequenceNumber,
       messages1[1].header.messageId,
+      Internal._hash(messages1[1], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1772,6 +1814,7 @@ contract OffRamp_execute is OffRampSetup {
       messages2[0].header.sourceChainSelector,
       messages2[0].header.sequenceNumber,
       messages2[0].header.messageId,
+      Internal._hash(messages2[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1802,6 +1845,7 @@ contract OffRamp_execute is OffRampSetup {
           reports[i].messages[j].header.sourceChainSelector,
           reports[i].messages[j].header.sequenceNumber,
           reports[i].messages[j].header.messageId,
+          Internal._hash(reports[i].messages[j], ON_RAMP_ADDRESS_1),
           Internal.MessageExecutionState.SUCCESS,
           ""
         );
@@ -1837,6 +1881,7 @@ contract OffRamp_execute is OffRampSetup {
       messages1[0].header.sourceChainSelector,
       messages1[0].header.sequenceNumber,
       messages1[0].header.messageId,
+      Internal._hash(messages1[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.FAILURE,
       abi.encodeWithSelector(
         IMessageInterceptor.MessageValidationError.selector,
@@ -1848,6 +1893,7 @@ contract OffRamp_execute is OffRampSetup {
       messages1[1].header.sourceChainSelector,
       messages1[1].header.sequenceNumber,
       messages1[1].header.messageId,
+      Internal._hash(messages1[1], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.SUCCESS,
       ""
     );
@@ -1856,6 +1902,7 @@ contract OffRamp_execute is OffRampSetup {
       messages2[0].header.sourceChainSelector,
       messages2[0].header.sequenceNumber,
       messages2[0].header.messageId,
+      Internal._hash(messages2[0], ON_RAMP_ADDRESS_1),
       Internal.MessageExecutionState.FAILURE,
       abi.encodeWithSelector(
         IMessageInterceptor.MessageValidationError.selector,
@@ -2216,7 +2263,8 @@ contract OffRamp_trialExecute is OffRampSetup {
       sourcePoolAddress: abi.encode(address(0)),
       destTokenAddress: abi.encode(address(0)),
       extraData: "",
-      amount: message.tokenAmounts[0].amount
+      amount: message.tokenAmounts[0].amount,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     message.header.messageId = Internal._hash(message, ON_RAMP_ADDRESS_1);
@@ -2233,7 +2281,8 @@ contract OffRamp_trialExecute is OffRampSetup {
       sourcePoolAddress: abi.encode(address(0)),
       destTokenAddress: abi.encode(notAContract),
       extraData: "",
-      amount: message.tokenAmounts[0].amount
+      amount: message.tokenAmounts[0].amount,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     message.header.messageId = Internal._hash(message, ON_RAMP_ADDRESS_1);
@@ -2264,7 +2313,8 @@ contract OffRamp__releaseOrMintSingleToken is OffRampSetup {
       sourcePoolAddress: abi.encode(s_sourcePoolByToken[token]),
       destTokenAddress: abi.encode(s_destTokenBySourceToken[token]),
       extraData: "",
-      amount: amount
+      amount: amount,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     vm.expectCall(
@@ -2297,7 +2347,8 @@ contract OffRamp__releaseOrMintSingleToken is OffRampSetup {
       sourcePoolAddress: abi.encode(s_sourcePoolByToken[token]),
       destTokenAddress: abi.encode(s_destTokenBySourceToken[token]),
       extraData: "",
-      amount: amount
+      amount: amount,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     // Mock the call so returns 2 slots of data
@@ -2318,7 +2369,8 @@ contract OffRamp__releaseOrMintSingleToken is OffRampSetup {
       sourcePoolAddress: abi.encode(s_sourcePoolByToken[token]),
       destTokenAddress: abi.encode(s_destTokenBySourceToken[token]),
       extraData: "",
-      amount: amount
+      amount: amount,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     bytes memory revertData = "failed to balanceOf";
@@ -2342,7 +2394,8 @@ contract OffRamp__releaseOrMintSingleToken is OffRampSetup {
       sourcePoolAddress: abi.encode(s_sourcePoolByToken[token]),
       destTokenAddress: abi.encode(s_destTokenBySourceToken[token]),
       extraData: "",
-      amount: amount
+      amount: amount,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     vm.mockCall(
@@ -2369,7 +2422,8 @@ contract OffRamp__releaseOrMintSingleToken is OffRampSetup {
       sourcePoolAddress: abi.encode(s_sourcePoolByToken[token]),
       destTokenAddress: abi.encode(s_destTokenBySourceToken[token]),
       extraData: "",
-      amount: amount
+      amount: amount,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     // This should make the call fail if it does not skip the check
@@ -2396,7 +2450,8 @@ contract OffRamp__releaseOrMintSingleToken is OffRampSetup {
       sourcePoolAddress: abi.encode(s_sourcePoolByToken[token]),
       destTokenAddress: abi.encode(destToken),
       extraData: "",
-      amount: amount
+      amount: amount,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     // Address(0) should always revert
@@ -2438,7 +2493,8 @@ contract OffRamp__releaseOrMintSingleToken is OffRampSetup {
       sourcePoolAddress: abi.encode(s_sourcePoolByToken[token]),
       destTokenAddress: abi.encode(destToken),
       extraData: "",
-      amount: amount
+      amount: amount,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     bytes memory revertData = "call reverted :o";
@@ -2594,7 +2650,8 @@ contract OffRamp_releaseOrMintTokens is OffRampSetup {
       sourcePoolAddress: abi.encode(fakePoolAddress),
       destTokenAddress: abi.encode(s_offRamp),
       extraData: "",
-      amount: 1
+      amount: 1,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     vm.expectRevert(abi.encodeWithSelector(OffRamp.NotACompatiblePool.selector, address(0)));
@@ -2646,7 +2703,8 @@ contract OffRamp_releaseOrMintTokens is OffRampSetup {
       sourcePoolAddress: unusedVar,
       destTokenAddress: abi.encode(destPool),
       extraData: unusedVar,
-      amount: 1
+      amount: 1,
+      destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
     });
 
     try s_offRamp.releaseOrMintTokens(
@@ -2783,9 +2841,9 @@ contract OffRamp_applySourceChainConfigUpdates is OffRampSetup {
     }
   }
 
-  function test_Fuzz_applySourceChainConfigUpdate_Success(OffRamp.SourceChainConfigArgs memory sourceChainConfigArgs)
-    public
-  {
+  function test_Fuzz_applySourceChainConfigUpdate_Success(
+    OffRamp.SourceChainConfigArgs memory sourceChainConfigArgs
+  ) public {
     // Skip invalid inputs
     vm.assume(sourceChainConfigArgs.sourceChainSelector != 0);
     vm.assume(sourceChainConfigArgs.onRamp.length != 0);
@@ -2941,8 +2999,7 @@ contract OffRamp_commit is OffRampSetup {
 
   function test_StaleReportWithRoot_Success() public {
     uint64 maxSeq = 12;
-    uint224 tokenStartPrice =
-      IPriceRegistry(s_offRamp.getDynamicConfig().priceRegistry).getTokenPrice(s_sourceFeeToken).value;
+    uint224 tokenStartPrice = IFeeQuoter(s_offRamp.getDynamicConfig().feeQuoter).getTokenPrice(s_sourceFeeToken).value;
 
     OffRamp.MerkleRoot[] memory roots = new OffRamp.MerkleRoot[](1);
     roots[0] = OffRamp.MerkleRoot({
@@ -2977,9 +3034,7 @@ contract OffRamp_commit is OffRampSetup {
 
     assertEq(maxSeq * 2 + 1, s_offRamp.getSourceChainConfig(SOURCE_CHAIN_SELECTOR).minSeqNr);
     assertEq(0, s_offRamp.getLatestPriceSequenceNumber());
-    assertEq(
-      tokenStartPrice, IPriceRegistry(s_offRamp.getDynamicConfig().priceRegistry).getTokenPrice(s_sourceFeeToken).value
-    );
+    assertEq(tokenStartPrice, IFeeQuoter(s_offRamp.getDynamicConfig().feeQuoter).getTokenPrice(s_sourceFeeToken).value);
   }
 
   function test_OnlyTokenPriceUpdates_Success() public {
@@ -2988,7 +3043,7 @@ contract OffRamp_commit is OffRampSetup {
       OffRamp.CommitReport({priceUpdates: _getSingleTokenPriceUpdateStruct(s_sourceFeeToken, 4e18), merkleRoots: roots});
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
 
     vm.expectEmit();
     emit MultiOCR3Base.Transmitted(uint8(Internal.OCRPluginType.Commit), s_configDigestCommit, s_latestSequenceNumber);
@@ -3004,7 +3059,7 @@ contract OffRamp_commit is OffRampSetup {
       OffRamp.CommitReport({priceUpdates: _getSingleTokenPriceUpdateStruct(s_sourceFeeToken, 4e18), merkleRoots: roots});
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
 
     vm.expectEmit();
     emit MultiOCR3Base.Transmitted(uint8(Internal.OCRPluginType.Commit), s_configDigestCommit, s_latestSequenceNumber);
@@ -3019,7 +3074,7 @@ contract OffRamp_commit is OffRampSetup {
       OffRamp.CommitReport({priceUpdates: _getSingleTokenPriceUpdateStruct(s_sourceFeeToken, 4e18), merkleRoots: roots});
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
     _commit(commitReport, s_latestSequenceNumber);
 
     assertEq(s_latestSequenceNumber, s_offRamp.getLatestPriceSequenceNumber());
@@ -3054,7 +3109,7 @@ contract OffRamp_commit is OffRampSetup {
 
     // The same sequence number can be reported again
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
 
     _commit(commitReport, s_latestSequenceNumber);
   }
@@ -3070,7 +3125,7 @@ contract OffRamp_commit is OffRampSetup {
     });
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(s_sourceFeeToken, tokenPrice1, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(s_sourceFeeToken, tokenPrice1, block.timestamp);
 
     vm.expectEmit();
     emit MultiOCR3Base.Transmitted(uint8(Internal.OCRPluginType.Commit), s_configDigestCommit, s_latestSequenceNumber);
@@ -3096,9 +3151,7 @@ contract OffRamp_commit is OffRampSetup {
     _commit(commitReport, s_latestSequenceNumber);
 
     assertEq(maxSeq + 1, s_offRamp.getSourceChainConfig(SOURCE_CHAIN_SELECTOR).minSeqNr);
-    assertEq(
-      tokenPrice1, IPriceRegistry(s_offRamp.getDynamicConfig().priceRegistry).getTokenPrice(s_sourceFeeToken).value
-    );
+    assertEq(tokenPrice1, IFeeQuoter(s_offRamp.getDynamicConfig().feeQuoter).getTokenPrice(s_sourceFeeToken).value);
     assertEq(s_latestSequenceNumber, s_offRamp.getLatestPriceSequenceNumber());
   }
 
@@ -3246,7 +3299,7 @@ contract OffRamp_commit is OffRampSetup {
       OffRamp.CommitReport({priceUpdates: _getSingleTokenPriceUpdateStruct(s_sourceFeeToken, 4e18), merkleRoots: roots});
 
     vm.expectEmit();
-    emit PriceRegistry.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
+    emit FeeQuoter.UsdPerTokenUpdated(s_sourceFeeToken, 4e18, block.timestamp);
     _commit(commitReport, s_latestSequenceNumber);
 
     vm.expectRevert(OffRamp.StaleCommitReport.selector);
diff --git a/contracts/src/v0.8/ccip/test/offRamp/OffRampSetup.t.sol b/contracts/src/v0.8/ccip/test/offRamp/OffRampSetup.t.sol
index 8156c8c14a..ae9fc044ac 100644
--- a/contracts/src/v0.8/ccip/test/offRamp/OffRampSetup.t.sol
+++ b/contracts/src/v0.8/ccip/test/offRamp/OffRampSetup.t.sol
@@ -15,21 +15,22 @@ import {MultiOCR3Base} from "../../ocr/MultiOCR3Base.sol";
 import {EVM2EVMOffRamp} from "../../offRamp/EVM2EVMOffRamp.sol";
 import {OffRamp} from "../../offRamp/OffRamp.sol";
 import {TokenPool} from "../../pools/TokenPool.sol";
+
+import {FeeQuoterSetup} from "../feeQuoter/FeeQuoterSetup.t.sol";
 import {EVM2EVMOffRampHelper} from "../helpers/EVM2EVMOffRampHelper.sol";
 import {MaybeRevertingBurnMintTokenPool} from "../helpers/MaybeRevertingBurnMintTokenPool.sol";
 import {MessageInterceptorHelper} from "../helpers/MessageInterceptorHelper.sol";
 import {OffRampHelper} from "../helpers/OffRampHelper.sol";
 import {MaybeRevertMessageReceiver} from "../helpers/receivers/MaybeRevertMessageReceiver.sol";
 import {MultiOCR3BaseSetup} from "../ocr/MultiOCR3BaseSetup.t.sol";
-import {PriceRegistrySetup} from "../priceRegistry/PriceRegistrySetup.t.sol";
 import {Vm} from "forge-std/Test.sol";
 
-contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
+contract OffRampSetup is FeeQuoterSetup, MultiOCR3BaseSetup {
   uint64 internal constant SOURCE_CHAIN_SELECTOR_1 = SOURCE_CHAIN_SELECTOR;
   uint64 internal constant SOURCE_CHAIN_SELECTOR_2 = 6433500567565415381;
   uint64 internal constant SOURCE_CHAIN_SELECTOR_3 = 4051577828743386545;
   bytes32 internal constant EXECUTION_STATE_CHANGE_TOPIC_HASH =
-    keccak256("ExecutionStateChanged(uint64,uint64,bytes32,uint8,bytes,uint256)");
+    keccak256("ExecutionStateChanged(uint64,uint64,bytes32,bytes32,uint8,bytes,uint256)");
 
   bytes internal constant ON_RAMP_ADDRESS_1 = abi.encode(ON_RAMP_ADDRESS);
   bytes internal constant ON_RAMP_ADDRESS_2 = abi.encode(0xaA3f843Cf8E33B1F02dd28303b6bD87B1aBF8AE4);
@@ -56,8 +57,8 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
 
   uint64 internal s_latestSequenceNumber;
 
-  function setUp() public virtual override(PriceRegistrySetup, MultiOCR3BaseSetup) {
-    PriceRegistrySetup.setUp();
+  function setUp() public virtual override(FeeQuoterSetup, MultiOCR3BaseSetup) {
+    FeeQuoterSetup.setUp();
     MultiOCR3BaseSetup.setUp();
 
     s_inboundMessageValidator = new MessageInterceptorHelper();
@@ -81,7 +82,7 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
         tokenAdminRegistry: address(s_tokenAdminRegistry),
         nonceManager: address(nonceManager)
       }),
-      _generateDynamicOffRampConfig(address(s_priceRegistry)),
+      _generateDynamicOffRampConfig(address(s_feeQuoter)),
       sourceChainConfigs
     );
 
@@ -106,7 +107,7 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
       transmitters: s_validTransmitters
     });
 
-    s_offRamp.setDynamicConfig(_generateDynamicOffRampConfig(address(s_priceRegistry)));
+    s_offRamp.setDynamicConfig(_generateDynamicOffRampConfig(address(s_feeQuoter)));
     s_offRamp.setOCR3Configs(ocrConfigs);
 
     address[] memory authorizedCallers = new address[](1);
@@ -117,7 +118,7 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
 
     address[] memory priceUpdaters = new address[](1);
     priceUpdaters[0] = address(s_offRamp);
-    s_priceRegistry.applyAuthorizedCallerUpdates(
+    s_feeQuoter.applyAuthorizedCallerUpdates(
       AuthorizedCallers.AuthorizedCallerArgs({addedCallers: priceUpdaters, removedCallers: new address[](0)})
     );
   }
@@ -146,7 +147,7 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
       s_validSigners,
       s_validTransmitters,
       s_F,
-      abi.encode(_generateDynamicOffRampConfig(address(router), address(s_priceRegistry))),
+      abi.encode(_generateDynamicOffRampConfig(address(router), address(s_feeQuoter))),
       s_offchainConfigVersion,
       abi.encode("")
     );
@@ -223,21 +224,19 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
   uint32 internal constant MAX_TOKEN_POOL_RELEASE_OR_MINT_GAS = 200_000;
   uint32 internal constant MAX_TOKEN_POOL_TRANSFER_GAS = 50_000;
 
-  function _generateDynamicOffRampConfig(address priceRegistry) internal pure returns (OffRamp.DynamicConfig memory) {
+  function _generateDynamicOffRampConfig(address feeQuoter) internal pure returns (OffRamp.DynamicConfig memory) {
     return OffRamp.DynamicConfig({
       permissionLessExecutionThresholdSeconds: PERMISSION_LESS_EXECUTION_THRESHOLD_SECONDS,
-      priceRegistry: priceRegistry,
+      feeQuoter: feeQuoter,
       messageValidator: address(0),
       maxPoolReleaseOrMintGas: MAX_TOKEN_POOL_RELEASE_OR_MINT_GAS,
       maxTokenTransferGas: MAX_TOKEN_POOL_TRANSFER_GAS
     });
   }
 
-  function _convertToGeneralMessage(Internal.Any2EVMRampMessage memory original)
-    internal
-    view
-    returns (Client.Any2EVMMessage memory message)
-  {
+  function _convertToGeneralMessage(
+    Internal.Any2EVMRampMessage memory original
+  ) internal view returns (Client.Any2EVMMessage memory message) {
     uint256 numberOfTokens = original.tokenAmounts.length;
     Client.EVMTokenAmount[] memory destTokenAmounts = new Client.EVMTokenAmount[](numberOfTokens);
 
@@ -297,7 +296,8 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
         sourcePoolAddress: abi.encode(s_sourcePoolByToken[tokenAmounts[i].token]),
         destTokenAddress: abi.encode(s_destTokenBySourceToken[tokenAmounts[i].token]),
         extraData: "",
-        amount: tokenAmounts[i].amount
+        amount: tokenAmounts[i].amount,
+        destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
       });
     }
 
@@ -372,11 +372,9 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
     return reports;
   }
 
-  function _getGasLimitsFromMessages(Internal.Any2EVMRampMessage[] memory messages)
-    internal
-    pure
-    returns (uint256[] memory)
-  {
+  function _getGasLimitsFromMessages(
+    Internal.Any2EVMRampMessage[] memory messages
+  ) internal pure returns (uint256[] memory) {
     uint256[] memory gasLimits = new uint256[](messages.length);
     for (uint256 i = 0; i < messages.length; ++i) {
       gasLimits[i] = messages[i].gasLimit;
@@ -390,7 +388,7 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
     assertEq(a.maxPoolReleaseOrMintGas, b.maxPoolReleaseOrMintGas);
     assertEq(a.maxTokenTransferGas, b.maxTokenTransferGas);
     assertEq(a.messageValidator, b.messageValidator);
-    assertEq(a.priceRegistry, b.priceRegistry);
+    assertEq(a.feeQuoter, b.feeQuoter);
   }
 
   function _assertSourceChainConfigEquality(
@@ -403,18 +401,17 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
     assertEq(address(config1.router), address(config2.router));
   }
 
-  function _getDefaultSourceTokenData(Client.EVMTokenAmount[] memory srcTokenAmounts)
-    internal
-    view
-    returns (Internal.RampTokenAmount[] memory)
-  {
+  function _getDefaultSourceTokenData(
+    Client.EVMTokenAmount[] memory srcTokenAmounts
+  ) internal view returns (Internal.RampTokenAmount[] memory) {
     Internal.RampTokenAmount[] memory sourceTokenData = new Internal.RampTokenAmount[](srcTokenAmounts.length);
     for (uint256 i = 0; i < srcTokenAmounts.length; ++i) {
       sourceTokenData[i] = Internal.RampTokenAmount({
         sourcePoolAddress: abi.encode(s_sourcePoolByToken[srcTokenAmounts[i].token]),
         destTokenAddress: abi.encode(s_destTokenBySourceToken[srcTokenAmounts[i].token]),
         extraData: "",
-        amount: srcTokenAmounts[i].amount
+        amount: srcTokenAmounts[i].amount,
+        destExecData: abi.encode(DEFAULT_TOKEN_DEST_GAS_OVERHEAD)
       });
     }
     return sourceTokenData;
@@ -434,7 +431,7 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
         tokenAdminRegistry: address(s_tokenAdminRegistry),
         nonceManager: address(s_inboundNonceManager)
       }),
-      _generateDynamicOffRampConfig(address(s_priceRegistry)),
+      _generateDynamicOffRampConfig(address(s_feeQuoter)),
       new OffRamp.SourceChainConfigArgs[](0)
     );
 
@@ -447,7 +444,7 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
 
     address[] memory priceUpdaters = new address[](1);
     priceUpdaters[0] = address(s_offRamp);
-    s_priceRegistry.applyAuthorizedCallerUpdates(
+    s_feeQuoter.applyAuthorizedCallerUpdates(
       AuthorizedCallers.AuthorizedCallerArgs({addedCallers: priceUpdaters, removedCallers: new address[](0)})
     );
   }
@@ -481,6 +478,7 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
     uint64 sourceChainSelector,
     uint64 sequenceNumber,
     bytes32 messageId,
+    bytes32 messageHash,
     Internal.MessageExecutionState state,
     bytes memory returnData
   ) public {
@@ -490,11 +488,13 @@ contract OffRampSetup is PriceRegistrySetup, MultiOCR3BaseSetup {
         uint64 logSourceChainSelector = uint64(uint256(logs[i].topics[1]));
         uint64 logSequenceNumber = uint64(uint256(logs[i].topics[2]));
         bytes32 logMessageId = bytes32(logs[i].topics[3]);
-        (uint8 logState, bytes memory logReturnData,) = abi.decode(logs[i].data, (uint8, bytes, uint256));
+        (bytes32 logMessageHash, uint8 logState, bytes memory logReturnData,) =
+          abi.decode(logs[i].data, (bytes32, uint8, bytes, uint256));
         if (logMessageId == messageId) {
           assertEq(logSourceChainSelector, sourceChainSelector);
           assertEq(logSequenceNumber, sequenceNumber);
           assertEq(logMessageId, messageId);
+          assertEq(logMessageHash, messageHash);
           assertEq(logState, uint8(state));
           assertEq(logReturnData, returnData);
         }
diff --git a/contracts/src/v0.8/ccip/test/onRamp/EVM2EVMOnRamp.t.sol b/contracts/src/v0.8/ccip/test/onRamp/EVM2EVMOnRamp.t.sol
index 54054716e6..f0cd0f80ed 100644
--- a/contracts/src/v0.8/ccip/test/onRamp/EVM2EVMOnRamp.t.sol
+++ b/contracts/src/v0.8/ccip/test/onRamp/EVM2EVMOnRamp.t.sol
@@ -27,7 +27,7 @@ contract EVM2EVMOnRamp_constructor is EVM2EVMOnRampSetup {
       tokenAdminRegistry: address(s_tokenAdminRegistry)
     });
     EVM2EVMOnRamp.DynamicConfig memory dynamicConfig =
-      generateDynamicOnRampConfig(address(s_sourceRouter), address(s_priceRegistry));
+      generateDynamicOnRampConfig(address(s_sourceRouter), address(s_feeQuoter));
 
     vm.expectEmit();
     emit EVM2EVMOnRamp.ConfigSet(staticConfig, dynamicConfig);
@@ -247,7 +247,7 @@ contract EVM2EVMOnRamp_forwardFromRouter is EVM2EVMOnRampSetup {
 
     address[] memory feeTokens = new address[](1);
     feeTokens[0] = s_sourceTokens[1];
-    s_priceRegistry.applyFeeTokensUpdates(feeTokens, new address[](0));
+    s_feeQuoter.applyFeeTokensUpdates(feeTokens, new address[](0));
 
     // Since we'll mostly be testing for valid calls from the router we'll
     // mock all calls to be originating from the router and re-mock in
@@ -437,8 +437,8 @@ contract EVM2EVMOnRamp_forwardFromRouter is EVM2EVMOnRampSetup {
     assertEq(IERC20(s_sourceTokens[1]).balanceOf(address(s_onRamp)), feeAmount);
 
     // Calculate conversion done by prices contract
-    uint256 feeTokenPrice = s_priceRegistry.getTokenPrice(s_sourceTokens[1]).value;
-    uint256 linkTokenPrice = s_priceRegistry.getTokenPrice(s_sourceFeeToken).value;
+    uint256 feeTokenPrice = s_feeQuoter.getTokenPrice(s_sourceTokens[1]).value;
+    uint256 linkTokenPrice = s_feeQuoter.getTokenPrice(s_sourceFeeToken).value;
     uint256 conversionRate = (feeTokenPrice * 1e18) / linkTokenPrice;
     uint256 expectedJuels = (feeAmount * conversionRate) / 1e18;
 
@@ -487,7 +487,7 @@ contract EVM2EVMOnRamp_forwardFromRouter is EVM2EVMOnRampSetup {
     // Set a high price to trip the ARL
     uint224 tokenPrice = 3 ** 128;
     Internal.PriceUpdates memory priceUpdates = _getSingleTokenPriceUpdateStruct(s_sourceTokens[0], tokenPrice);
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
     vm.startPrank(address(s_sourceRouter));
 
     vm.expectRevert(
@@ -662,7 +662,7 @@ contract EVM2EVMOnRamp_forwardFromRouter is EVM2EVMOnRampSetup {
     vm.startPrank(OWNER);
 
     Internal.PriceUpdates memory priceUpdates = _getSingleTokenPriceUpdateStruct(wrongToken, 1);
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
 
     // Change back to the router
     vm.startPrank(address(s_sourceRouter));
@@ -694,7 +694,7 @@ contract EVM2EVMOnRamp_forwardFromRouter is EVM2EVMOnRampSetup {
     // Set token price to 0
     vm.stopPrank();
     vm.startPrank(OWNER);
-    s_priceRegistry.updatePrices(_getSingleTokenPriceUpdateStruct(CUSTOM_TOKEN, 0));
+    s_feeQuoter.updatePrices(_getSingleTokenPriceUpdateStruct(CUSTOM_TOKEN, 0));
 
     vm.startPrank(address(s_sourceRouter));
 
@@ -905,7 +905,7 @@ contract EVM2EVMOnRamp_forwardFromRouter_upgrade is EVM2EVMOnRampSetup {
         rmnProxy: address(s_mockRMN),
         tokenAdminRegistry: address(s_tokenAdminRegistry)
       }),
-      generateDynamicOnRampConfig(address(s_sourceRouter), address(s_priceRegistry)),
+      generateDynamicOnRampConfig(address(s_sourceRouter), address(s_feeQuoter)),
       _getOutboundRateLimiterConfig(),
       s_feeTokenConfigArgs,
       s_tokenTransferFeeConfigArgs,
@@ -1407,6 +1407,32 @@ contract EVM2EVMOnRamp_getFee is EVM2EVMOnRamp_getFeeSetup {
     }
   }
 
+  function test_GetFeeOfZeroForTokenMessage_Success() public {
+    Client.EVM2AnyMessage memory message = _generateEmptyMessage();
+
+    uint256 feeAmount = s_onRamp.getFee(DEST_CHAIN_SELECTOR, message);
+    assertTrue(feeAmount > 0);
+
+    EVM2EVMOnRamp.FeeTokenConfigArgs[] memory feeTokenConfigArgs = new EVM2EVMOnRamp.FeeTokenConfigArgs[](1);
+    feeTokenConfigArgs[0] = EVM2EVMOnRamp.FeeTokenConfigArgs({
+      token: message.feeToken,
+      networkFeeUSDCents: 0,
+      gasMultiplierWeiPerEth: 0,
+      premiumMultiplierWeiPerEth: 0,
+      enabled: true
+    });
+
+    s_onRamp.setFeeTokenConfig(feeTokenConfigArgs);
+    EVM2EVMOnRamp.DynamicConfig memory config =
+      generateDynamicOnRampConfig(address(s_sourceRouter), address(s_feeQuoter));
+    config.destDataAvailabilityMultiplierBps = 0;
+
+    s_onRamp.setDynamicConfig(config);
+
+    feeAmount = s_onRamp.getFee(DEST_CHAIN_SELECTOR, message);
+    assertEq(0, feeAmount);
+  }
+
   function test_ZeroDataAvailabilityMultiplier_Success() public {
     EVM2EVMOnRamp.DynamicConfig memory dynamicConfig = s_onRamp.getDynamicConfig();
     dynamicConfig.destDataAvailabilityMultiplierBps = 0;
diff --git a/contracts/src/v0.8/ccip/test/onRamp/EVM2EVMOnRampSetup.t.sol b/contracts/src/v0.8/ccip/test/onRamp/EVM2EVMOnRampSetup.t.sol
index f827bf983c..84350448a1 100644
--- a/contracts/src/v0.8/ccip/test/onRamp/EVM2EVMOnRampSetup.t.sol
+++ b/contracts/src/v0.8/ccip/test/onRamp/EVM2EVMOnRampSetup.t.sol
@@ -7,12 +7,13 @@ import {Internal} from "../../libraries/Internal.sol";
 import {Pool} from "../../libraries/Pool.sol";
 import {EVM2EVMOnRamp} from "../../onRamp/EVM2EVMOnRamp.sol";
 import {TokenSetup} from "../TokenSetup.t.sol";
+
+import {FeeQuoterSetup} from "../feeQuoter/FeeQuoterSetup.t.sol";
 import {EVM2EVMOnRampHelper} from "../helpers/EVM2EVMOnRampHelper.sol";
-import {PriceRegistrySetup} from "../priceRegistry/PriceRegistrySetup.t.sol";
 
 import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
-contract EVM2EVMOnRampSetup is TokenSetup, PriceRegistrySetup {
+contract EVM2EVMOnRampSetup is TokenSetup, FeeQuoterSetup {
   uint256 internal immutable i_tokenAmount0 = 9;
   uint256 internal immutable i_tokenAmount1 = 7;
 
@@ -27,11 +28,11 @@ contract EVM2EVMOnRampSetup is TokenSetup, PriceRegistrySetup {
   EVM2EVMOnRamp.FeeTokenConfigArgs[] internal s_feeTokenConfigArgs;
   EVM2EVMOnRamp.TokenTransferFeeConfigArgs[] internal s_tokenTransferFeeConfigArgs;
 
-  function setUp() public virtual override(TokenSetup, PriceRegistrySetup) {
+  function setUp() public virtual override(TokenSetup, FeeQuoterSetup) {
     TokenSetup.setUp();
-    PriceRegistrySetup.setUp();
+    FeeQuoterSetup.setUp();
 
-    s_priceRegistry.updatePrices(_getSingleTokenPriceUpdateStruct(CUSTOM_TOKEN, CUSTOM_TOKEN_PRICE));
+    s_feeQuoter.updatePrices(_getSingleTokenPriceUpdateStruct(CUSTOM_TOKEN, CUSTOM_TOKEN_PRICE));
 
     address WETH = s_sourceRouter.getWrappedNative();
 
@@ -88,7 +89,7 @@ contract EVM2EVMOnRampSetup is TokenSetup, PriceRegistrySetup {
         rmnProxy: address(s_mockRMN),
         tokenAdminRegistry: address(s_tokenAdminRegistry)
       }),
-      generateDynamicOnRampConfig(address(s_sourceRouter), address(s_priceRegistry)),
+      generateDynamicOnRampConfig(address(s_sourceRouter), address(s_feeQuoter)),
       _getOutboundRateLimiterConfig(),
       s_feeTokenConfigArgs,
       s_tokenTransferFeeConfigArgs,
diff --git a/contracts/src/v0.8/ccip/test/onRamp/OnRamp.t.sol b/contracts/src/v0.8/ccip/test/onRamp/OnRamp.t.sol
index 10c0a9f0db..a6f4205ee1 100644
--- a/contracts/src/v0.8/ccip/test/onRamp/OnRamp.t.sol
+++ b/contracts/src/v0.8/ccip/test/onRamp/OnRamp.t.sol
@@ -5,7 +5,7 @@ import {IMessageInterceptor} from "../../interfaces/IMessageInterceptor.sol";
 import {IRouter} from "../../interfaces/IRouter.sol";
 
 import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
-import {PriceRegistry} from "../../PriceRegistry.sol";
+import {FeeQuoter} from "../../FeeQuoter.sol";
 import {Client} from "../../libraries/Client.sol";
 import {Internal} from "../../libraries/Internal.sol";
 import {Pool} from "../../libraries/Pool.sol";
@@ -25,12 +25,12 @@ contract OnRamp_constructor is OnRampSetup {
       nonceManager: address(s_outboundNonceManager),
       tokenAdminRegistry: address(s_tokenAdminRegistry)
     });
-    OnRamp.DynamicConfig memory dynamicConfig = _generateDynamicOnRampConfig(address(s_priceRegistry));
+    OnRamp.DynamicConfig memory dynamicConfig = _generateDynamicOnRampConfig(address(s_feeQuoter));
 
     vm.expectEmit();
     emit OnRamp.ConfigSet(staticConfig, dynamicConfig);
     vm.expectEmit();
-    emit OnRamp.DestChainConfigSet(DEST_CHAIN_SELECTOR, OnRamp.DestChainConfig(0, s_sourceRouter));
+    emit OnRamp.DestChainConfigSet(DEST_CHAIN_SELECTOR, 0, s_sourceRouter, false);
 
     _deployOnRamp(SOURCE_CHAIN_SELECTOR, s_sourceRouter, address(s_outboundNonceManager), address(s_tokenAdminRegistry));
 
@@ -56,7 +56,7 @@ contract OnRamp_constructor is OnRampSetup {
         nonceManager: address(s_outboundNonceManager),
         tokenAdminRegistry: address(s_tokenAdminRegistry)
       }),
-      _generateDynamicOnRampConfig(address(s_priceRegistry)),
+      _generateDynamicOnRampConfig(address(s_feeQuoter)),
       _generateDestChainConfigArgs(IRouter(address(0)))
     );
   }
@@ -70,7 +70,7 @@ contract OnRamp_constructor is OnRampSetup {
         nonceManager: address(s_outboundNonceManager),
         tokenAdminRegistry: address(s_tokenAdminRegistry)
       }),
-      _generateDynamicOnRampConfig(address(s_priceRegistry)),
+      _generateDynamicOnRampConfig(address(s_feeQuoter)),
       _generateDestChainConfigArgs(IRouter(address(0)))
     );
   }
@@ -84,7 +84,7 @@ contract OnRamp_constructor is OnRampSetup {
         nonceManager: address(0),
         tokenAdminRegistry: address(s_tokenAdminRegistry)
       }),
-      _generateDynamicOnRampConfig(address(s_priceRegistry)),
+      _generateDynamicOnRampConfig(address(s_feeQuoter)),
       _generateDestChainConfigArgs(IRouter(address(0)))
     );
   }
@@ -98,7 +98,7 @@ contract OnRamp_constructor is OnRampSetup {
         nonceManager: address(s_outboundNonceManager),
         tokenAdminRegistry: address(0)
       }),
-      _generateDynamicOnRampConfig(address(s_priceRegistry)),
+      _generateDynamicOnRampConfig(address(s_feeQuoter)),
       _generateDestChainConfigArgs(IRouter(address(0)))
     );
   }
@@ -115,7 +115,21 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
 
     address[] memory feeTokens = new address[](1);
     feeTokens[0] = s_sourceTokens[1];
-    s_priceRegistry.applyFeeTokensUpdates(feeTokens, new address[](0));
+    s_feeQuoter.applyFeeTokensUpdates(feeTokens, new address[](0));
+
+    uint64[] memory destinationChainSelectors = new uint64[](1);
+    destinationChainSelectors[0] = DEST_CHAIN_SELECTOR;
+    address[] memory addAllowedList = new address[](1);
+    addAllowedList[0] = OWNER;
+    OnRamp.AllowListConfigArgs memory allowListConfigArgs = OnRamp.AllowListConfigArgs({
+      allowListEnabled: true,
+      destChainSelector: DEST_CHAIN_SELECTOR,
+      addedAllowlistedSenders: addAllowedList,
+      removedAllowlistedSenders: new address[](0)
+    });
+    OnRamp.AllowListConfigArgs[] memory applyAllowListConfigArgsItems = new OnRamp.AllowListConfigArgs[](1);
+    applyAllowListConfigArgsItems[0] = allowListConfigArgs;
+    s_onRamp.applyAllowListUpdates(applyAllowListConfigArgsItems);
 
     // Since we'll mostly be testing for valid calls from the router we'll
     // mock all calls to be originating from the router and re-mock in
@@ -286,8 +300,8 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
     IERC20(s_sourceTokens[1]).transferFrom(OWNER, address(s_onRamp), feeAmount);
 
     // Calculate conversion done by prices contract
-    uint256 feeTokenPrice = s_priceRegistry.getTokenPrice(s_sourceTokens[1]).value;
-    uint256 linkTokenPrice = s_priceRegistry.getTokenPrice(s_sourceFeeToken).value;
+    uint256 feeTokenPrice = s_feeQuoter.getTokenPrice(s_sourceTokens[1]).value;
+    uint256 linkTokenPrice = s_feeQuoter.getTokenPrice(s_sourceFeeToken).value;
     uint256 conversionRate = (feeTokenPrice * 1e18) / linkTokenPrice;
     uint256 expectedJuels = (feeAmount * conversionRate) / 1e18;
 
@@ -308,6 +322,25 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
     vm.assume(originalSender != address(0));
     vm.assume(uint160(receiver) >= Internal.PRECOMPILE_SPACE);
     feeTokenAmount = uint96(bound(feeTokenAmount, 0, MAX_MSG_FEES_JUELS));
+    vm.stopPrank();
+
+    vm.startPrank(OWNER);
+    uint64[] memory destinationChainSelectors = new uint64[](1);
+    destinationChainSelectors[0] = uint64(DEST_CHAIN_SELECTOR);
+    address[] memory addAllowedList = new address[](1);
+    addAllowedList[0] = originalSender;
+    OnRamp.AllowListConfigArgs memory allowListConfigArgs = OnRamp.AllowListConfigArgs({
+      allowListEnabled: true,
+      destChainSelector: DEST_CHAIN_SELECTOR,
+      addedAllowlistedSenders: addAllowedList,
+      removedAllowlistedSenders: new address[](0)
+    });
+    OnRamp.AllowListConfigArgs[] memory applyAllowListConfigArgsItems = new OnRamp.AllowListConfigArgs[](1);
+    applyAllowListConfigArgsItems[0] = allowListConfigArgs;
+    s_onRamp.applyAllowListUpdates(applyAllowListConfigArgsItems);
+    vm.stopPrank();
+
+    vm.startPrank(address(s_sourceRouter));
 
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     message.receiver = abi.encode(receiver);
@@ -362,7 +395,7 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     message.extraArgs = bytes("bad args");
 
-    vm.expectRevert(PriceRegistry.InvalidExtraArgsTag.selector);
+    vm.expectRevert(FeeQuoter.InvalidExtraArgsTag.selector);
 
     s_onRamp.forwardFromRouter(DEST_CHAIN_SELECTOR, message, 0, OWNER);
   }
@@ -379,6 +412,13 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
     s_onRamp.forwardFromRouter(DEST_CHAIN_SELECTOR, _generateEmptyMessage(), 0, address(0));
   }
 
+  function test_UnAllowedOriginalSender_Revert() public {
+    vm.stopPrank();
+    vm.startPrank(STRANGER);
+    vm.expectRevert(abi.encodeWithSelector(OnRamp.SenderNotAllowed.selector, STRANGER));
+    s_onRamp.forwardFromRouter(DEST_CHAIN_SELECTOR, _generateEmptyMessage(), 0, STRANGER);
+  }
+
   function test_MessageValidationError_Revert() public {
     _enableOutboundMessageValidator();
 
@@ -398,13 +438,13 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
     s_onRamp.forwardFromRouter(DEST_CHAIN_SELECTOR, message, feeAmount, OWNER);
   }
 
-  function test_CannotSendZeroTokens_Revert() public {
+  function test_MultiCannotSendZeroTokens_Revert() public {
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     message.tokenAmounts = new Client.EVMTokenAmount[](1);
     message.tokenAmounts[0].amount = 0;
     message.tokenAmounts[0].token = s_sourceTokens[0];
     vm.expectRevert(OnRamp.CannotSendZeroTokens.selector);
-    s_onRamp.forwardFromRouter(DEST_CHAIN_SELECTOR, message, 0, STRANGER);
+    s_onRamp.forwardFromRouter(DEST_CHAIN_SELECTOR, message, 0, OWNER);
   }
 
   function test_UnsupportedToken_Revert() public {
@@ -421,7 +461,7 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
     vm.startPrank(OWNER);
 
     Internal.PriceUpdates memory priceUpdates = _getSingleTokenPriceUpdateStruct(wrongToken, 1);
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
 
     // Change back to the router
     vm.startPrank(address(s_sourceRouter));
@@ -445,7 +485,7 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
 
     vm.expectRevert(
-      abi.encodeWithSelector(PriceRegistry.MessageFeeTooHigh.selector, MAX_MSG_FEES_JUELS + 1, MAX_MSG_FEES_JUELS)
+      abi.encodeWithSelector(FeeQuoter.MessageFeeTooHigh.selector, MAX_MSG_FEES_JUELS + 1, MAX_MSG_FEES_JUELS)
     );
 
     s_onRamp.forwardFromRouter(DEST_CHAIN_SELECTOR, message, MAX_MSG_FEES_JUELS + 1, OWNER);
@@ -495,17 +535,15 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
     newPool.setSourceTokenData(new bytes(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES + 1));
 
     vm.startPrank(address(s_sourceRouter));
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.SourceTokenDataTooLarge.selector, sourceETH));
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.SourceTokenDataTooLarge.selector, sourceETH));
     s_onRamp.forwardFromRouter(DEST_CHAIN_SELECTOR, message, 0, OWNER);
 
     // Set token config to allow larger data
     vm.startPrank(OWNER);
-    PriceRegistry.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs =
-      _generateTokenTransferFeeConfigArgs(1, 1);
+    FeeQuoter.TokenTransferFeeConfigArgs[] memory tokenTransferFeeConfigArgs = _generateTokenTransferFeeConfigArgs(1, 1);
     tokenTransferFeeConfigArgs[0].destChainSelector = DEST_CHAIN_SELECTOR;
     tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].token = sourceETH;
-    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig = PriceRegistry
-      .TokenTransferFeeConfig({
+    tokenTransferFeeConfigArgs[0].tokenTransferFeeConfigs[0].tokenTransferFeeConfig = FeeQuoter.TokenTransferFeeConfig({
       minFeeUSDCents: 1,
       maxFeeUSDCents: 0,
       deciBps: 0,
@@ -513,8 +551,8 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
       destBytesOverhead: uint32(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES) + 32,
       isEnabled: true
     });
-    s_priceRegistry.applyTokenTransferFeeConfigUpdates(
-      tokenTransferFeeConfigArgs, new PriceRegistry.TokenTransferFeeConfigRemoveArgs[](0)
+    s_feeQuoter.applyTokenTransferFeeConfigUpdates(
+      tokenTransferFeeConfigArgs, new FeeQuoter.TokenTransferFeeConfigRemoveArgs[](0)
     );
 
     vm.startPrank(address(s_sourceRouter));
@@ -525,7 +563,7 @@ contract OnRamp_forwardFromRouter is OnRampSetup {
     newPool.setSourceTokenData(new bytes(uint32(Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES) + 32 + 1));
 
     vm.startPrank(address(s_sourceRouter));
-    vm.expectRevert(abi.encodeWithSelector(PriceRegistry.SourceTokenDataTooLarge.selector, sourceETH));
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.SourceTokenDataTooLarge.selector, sourceETH));
     s_onRamp.forwardFromRouter(DEST_CHAIN_SELECTOR, message, 0, OWNER);
   }
 }
@@ -549,7 +587,7 @@ contract OnRamp_getFee is OnRampSetup {
       message.feeToken = testTokens[i];
 
       uint256 feeAmount = s_onRamp.getFee(DEST_CHAIN_SELECTOR, message);
-      uint256 expectedFeeAmount = s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+      uint256 expectedFeeAmount = s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
 
       assertEq(expectedFeeAmount, feeAmount);
     }
@@ -565,12 +603,32 @@ contract OnRamp_getFee is OnRampSetup {
       message.feeToken = testTokens[i];
 
       uint256 feeAmount = s_onRamp.getFee(DEST_CHAIN_SELECTOR, message);
-      uint256 expectedFeeAmount = s_priceRegistry.getValidatedFee(DEST_CHAIN_SELECTOR, message);
+      uint256 expectedFeeAmount = s_feeQuoter.getValidatedFee(DEST_CHAIN_SELECTOR, message);
 
       assertEq(expectedFeeAmount, feeAmount);
     }
   }
 
+  function test_GetFeeOfZeroForTokenMessage_Success() public {
+    Client.EVM2AnyMessage memory message = _generateEmptyMessage();
+
+    uint256 feeAmount = s_onRamp.getFee(DEST_CHAIN_SELECTOR, message);
+    assertTrue(feeAmount > 0);
+
+    FeeQuoter.PremiumMultiplierWeiPerEthArgs[] memory tokenMults = new FeeQuoter.PremiumMultiplierWeiPerEthArgs[](1);
+    tokenMults[0] = FeeQuoter.PremiumMultiplierWeiPerEthArgs({token: message.feeToken, premiumMultiplierWeiPerEth: 0});
+    s_feeQuoter.applyPremiumMultiplierWeiPerEthUpdates(tokenMults);
+
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
+    destChainConfigArgs[0].destChainConfig.destDataAvailabilityMultiplierBps = 0;
+    destChainConfigArgs[0].destChainConfig.gasMultiplierWeiPerEth = 0;
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
+
+    feeAmount = s_onRamp.getFee(DEST_CHAIN_SELECTOR, message);
+
+    assertEq(0, feeAmount);
+  }
+
   // Reverts
 
   function test_Unhealthy_Revert() public {
@@ -584,16 +642,25 @@ contract OnRamp_getFee is OnRampSetup {
     vm.stopPrank();
     vm.startPrank(OWNER);
 
-    PriceRegistry.DestChainConfigArgs[] memory destChainConfigArgs = _generatePriceRegistryDestChainConfigArgs();
+    FeeQuoter.DestChainConfigArgs[] memory destChainConfigArgs = _generateFeeQuoterDestChainConfigArgs();
     destChainConfigArgs[0].destChainConfig.enforceOutOfOrder = true;
-    s_priceRegistry.applyDestChainConfigUpdates(destChainConfigArgs);
+    s_feeQuoter.applyDestChainConfigUpdates(destChainConfigArgs);
     vm.stopPrank();
 
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     // Empty extraArgs to should revert since it enforceOutOfOrder is true.
     message.extraArgs = "";
 
-    vm.expectRevert(PriceRegistry.ExtraArgOutOfOrderExecutionMustBeTrue.selector);
+    vm.expectRevert(FeeQuoter.ExtraArgOutOfOrderExecutionMustBeTrue.selector);
+    s_onRamp.getFee(DEST_CHAIN_SELECTOR, message);
+  }
+
+  function test_NotAFeeTokenButPricedToken_Revert() public {
+    Client.EVM2AnyMessage memory message = _generateEmptyMessage();
+    message.feeToken = s_sourceTokens[1];
+
+    vm.expectRevert(abi.encodeWithSelector(FeeQuoter.FeeTokenNotSupported.selector, message.feeToken));
+
     s_onRamp.getFee(DEST_CHAIN_SELECTOR, message);
   }
 }
@@ -602,9 +669,10 @@ contract OnRamp_setDynamicConfig is OnRampSetup {
   function test_SetDynamicConfig_Success() public {
     OnRamp.StaticConfig memory staticConfig = s_onRamp.getStaticConfig();
     OnRamp.DynamicConfig memory newConfig = OnRamp.DynamicConfig({
-      priceRegistry: address(23423),
+      feeQuoter: address(23423),
       messageValidator: makeAddr("messageValidator"),
-      feeAggregator: FEE_AGGREGATOR
+      feeAggregator: FEE_AGGREGATOR,
+      allowListAdmin: address(0)
     });
 
     vm.expectEmit();
@@ -613,16 +681,17 @@ contract OnRamp_setDynamicConfig is OnRampSetup {
     s_onRamp.setDynamicConfig(newConfig);
 
     OnRamp.DynamicConfig memory gotDynamicConfig = s_onRamp.getDynamicConfig();
-    assertEq(newConfig.priceRegistry, gotDynamicConfig.priceRegistry);
+    assertEq(newConfig.feeQuoter, gotDynamicConfig.feeQuoter);
   }
 
   // Reverts
 
-  function test_SetConfigInvalidConfigPriceRegistryEqAddressZero_Revert() public {
+  function test_SetConfigInvalidConfigFeeQuoterEqAddressZero_Revert() public {
     OnRamp.DynamicConfig memory newConfig = OnRamp.DynamicConfig({
-      priceRegistry: address(0),
+      feeQuoter: address(0),
       feeAggregator: FEE_AGGREGATOR,
-      messageValidator: makeAddr("messageValidator")
+      messageValidator: makeAddr("messageValidator"),
+      allowListAdmin: address(0)
     });
 
     vm.expectRevert(OnRamp.InvalidConfig.selector);
@@ -630,18 +699,27 @@ contract OnRamp_setDynamicConfig is OnRampSetup {
   }
 
   function test_SetConfigInvalidConfig_Revert() public {
-    OnRamp.DynamicConfig memory newConfig =
-      OnRamp.DynamicConfig({priceRegistry: address(23423), messageValidator: address(0), feeAggregator: FEE_AGGREGATOR});
+    OnRamp.DynamicConfig memory newConfig = OnRamp.DynamicConfig({
+      feeQuoter: address(23423),
+      messageValidator: address(0),
+      feeAggregator: FEE_AGGREGATOR,
+      allowListAdmin: address(0)
+    });
 
     // Invalid price reg reverts.
-    newConfig.priceRegistry = address(0);
+    newConfig.feeQuoter = address(0);
     vm.expectRevert(OnRamp.InvalidConfig.selector);
     s_onRamp.setDynamicConfig(newConfig);
   }
 
   function test_SetConfigInvalidConfigFeeAggregatorEqAddressZero_Revert() public {
-    OnRamp.DynamicConfig memory newConfig =
-      OnRamp.DynamicConfig({priceRegistry: address(23423), messageValidator: address(0), feeAggregator: address(0)});
+    OnRamp.DynamicConfig memory newConfig = OnRamp.DynamicConfig({
+      feeQuoter: address(23423),
+      messageValidator: address(0),
+      feeAggregator: address(0),
+      allowListAdmin: address(0)
+    });
+
     vm.expectRevert(OnRamp.InvalidConfig.selector);
     s_onRamp.setDynamicConfig(newConfig);
   }
@@ -689,7 +767,7 @@ contract OnRamp_withdrawFeeTokens is OnRampSetup {
       IERC20(feeTokens[i]).transfer(address(s_onRamp), amounts[i]);
     }
 
-    s_priceRegistry.applyFeeTokensUpdates(feeTokens, new address[](0));
+    s_feeQuoter.applyFeeTokensUpdates(feeTokens, new address[](0));
 
     for (uint256 i = 0; i < feeTokens.length; ++i) {
       vm.expectEmit();
@@ -742,7 +820,7 @@ contract OnRamp_applyDestChainConfigUpdates is OnRampSetup {
 
     // supports disabling a lane by setting a router to zero
     vm.expectEmit();
-    emit OnRamp.DestChainConfigSet(DEST_CHAIN_SELECTOR, OnRamp.DestChainConfig(0, IRouter(address(0))));
+    emit OnRamp.DestChainConfigSet(DEST_CHAIN_SELECTOR, 0, IRouter(address(0)), false);
     s_onRamp.applyDestChainConfigUpdates(configArgs);
     assertEq(address(0), address(s_onRamp.getRouter(DEST_CHAIN_SELECTOR)));
 
@@ -751,9 +829,9 @@ contract OnRamp_applyDestChainConfigUpdates is OnRampSetup {
     configArgs[0] = OnRamp.DestChainConfigArgs({destChainSelector: DEST_CHAIN_SELECTOR, router: s_sourceRouter});
     configArgs[1] = OnRamp.DestChainConfigArgs({destChainSelector: 9999, router: IRouter(address(9999))});
     vm.expectEmit();
-    emit OnRamp.DestChainConfigSet(DEST_CHAIN_SELECTOR, OnRamp.DestChainConfig(0, s_sourceRouter));
+    emit OnRamp.DestChainConfigSet(DEST_CHAIN_SELECTOR, 0, s_sourceRouter, false);
     vm.expectEmit();
-    emit OnRamp.DestChainConfigSet(9999, OnRamp.DestChainConfig(0, IRouter(address(9999))));
+    emit OnRamp.DestChainConfigSet(9999, 0, IRouter(address(9999)), false);
     s_onRamp.applyDestChainConfigUpdates(configArgs);
     assertEq(address(s_sourceRouter), address(s_onRamp.getRouter(DEST_CHAIN_SELECTOR)));
     assertEq(address(9999), address(s_onRamp.getRouter(9999)));
@@ -765,7 +843,7 @@ contract OnRamp_applyDestChainConfigUpdates is OnRampSetup {
     assertEq(numLogs, vm.getRecordedLogs().length); // indicates no changes made
   }
 
-  function test_ApplyDestChainConfigUpdates_WithInalidChainSelector_Revert() external {
+  function test_ApplyDestChainConfigUpdates_WithInvalidChainSelector_Revert() external {
     vm.stopPrank();
     vm.startPrank(OWNER);
     OnRamp.DestChainConfigArgs[] memory configArgs = new OnRamp.DestChainConfigArgs[](1);
@@ -774,3 +852,141 @@ contract OnRamp_applyDestChainConfigUpdates is OnRampSetup {
     s_onRamp.applyDestChainConfigUpdates(configArgs);
   }
 }
+
+contract OnRamp_allowListConfigUpdates is OnRampSetup {
+  function test_applyAllowList_Success() public {
+    vm.stopPrank();
+    vm.startPrank(OWNER);
+
+    OnRamp.DestChainConfigArgs[] memory configArgs = new OnRamp.DestChainConfigArgs[](2);
+    configArgs[0] = OnRamp.DestChainConfigArgs({destChainSelector: DEST_CHAIN_SELECTOR, router: s_sourceRouter});
+    configArgs[1] = OnRamp.DestChainConfigArgs({destChainSelector: 9999, router: IRouter(address(9999))});
+    vm.expectEmit();
+    emit OnRamp.DestChainConfigSet(DEST_CHAIN_SELECTOR, 0, s_sourceRouter, false);
+    vm.expectEmit();
+    emit OnRamp.DestChainConfigSet(9999, 0, IRouter(address(9999)), false);
+    s_onRamp.applyDestChainConfigUpdates(configArgs);
+
+    (uint64 sequenceNumber, bool allowListEnabled, address router) = s_onRamp.getDestChainConfig(9999);
+    assertEq(sequenceNumber, 0);
+    assertEq(allowListEnabled, false);
+    assertEq(router, address(9999));
+
+    uint64[] memory destinationChainSelectors = new uint64[](2);
+    destinationChainSelectors[0] = DEST_CHAIN_SELECTOR;
+    destinationChainSelectors[1] = uint64(99999);
+
+    address[] memory addedAllowlistedSenders = new address[](4);
+    addedAllowlistedSenders[0] = vm.addr(1);
+    addedAllowlistedSenders[1] = vm.addr(2);
+    addedAllowlistedSenders[2] = vm.addr(3);
+    addedAllowlistedSenders[3] = vm.addr(4);
+
+    vm.expectEmit();
+    emit OnRamp.AllowListSendersAdded(DEST_CHAIN_SELECTOR, addedAllowlistedSenders);
+
+    OnRamp.AllowListConfigArgs memory allowListConfigArgs = OnRamp.AllowListConfigArgs({
+      allowListEnabled: true,
+      destChainSelector: DEST_CHAIN_SELECTOR,
+      addedAllowlistedSenders: addedAllowlistedSenders,
+      removedAllowlistedSenders: new address[](0)
+    });
+
+    OnRamp.AllowListConfigArgs[] memory applyAllowListConfigArgsItems = new OnRamp.AllowListConfigArgs[](1);
+    applyAllowListConfigArgsItems[0] = allowListConfigArgs;
+
+    s_onRamp.applyAllowListUpdates(applyAllowListConfigArgsItems);
+    assertEq(4, s_onRamp.getAllowedSendersList(DEST_CHAIN_SELECTOR).length);
+
+    assertEq(addedAllowlistedSenders, s_onRamp.getAllowedSendersList(DEST_CHAIN_SELECTOR));
+
+    address[] memory removedAllowlistedSenders = new address[](1);
+    removedAllowlistedSenders[0] = vm.addr(2);
+
+    vm.expectEmit();
+    emit OnRamp.AllowListSendersRemoved(DEST_CHAIN_SELECTOR, removedAllowlistedSenders);
+
+    allowListConfigArgs = OnRamp.AllowListConfigArgs({
+      allowListEnabled: true,
+      destChainSelector: DEST_CHAIN_SELECTOR,
+      addedAllowlistedSenders: new address[](0),
+      removedAllowlistedSenders: removedAllowlistedSenders
+    });
+
+    OnRamp.AllowListConfigArgs[] memory allowListConfigArgsItems_2 = new OnRamp.AllowListConfigArgs[](1);
+    allowListConfigArgsItems_2[0] = allowListConfigArgs;
+
+    s_onRamp.applyAllowListUpdates(allowListConfigArgsItems_2);
+    assertEq(3, s_onRamp.getAllowedSendersList(DEST_CHAIN_SELECTOR).length);
+
+    addedAllowlistedSenders = new address[](2);
+    addedAllowlistedSenders[0] = vm.addr(5);
+    addedAllowlistedSenders[1] = vm.addr(6);
+
+    removedAllowlistedSenders = new address[](2);
+    removedAllowlistedSenders[0] = vm.addr(1);
+    removedAllowlistedSenders[1] = vm.addr(3);
+
+    vm.expectEmit();
+    emit OnRamp.AllowListSendersAdded(DEST_CHAIN_SELECTOR, addedAllowlistedSenders);
+    emit OnRamp.AllowListSendersRemoved(DEST_CHAIN_SELECTOR, removedAllowlistedSenders);
+
+    allowListConfigArgs = OnRamp.AllowListConfigArgs({
+      allowListEnabled: true,
+      destChainSelector: DEST_CHAIN_SELECTOR,
+      addedAllowlistedSenders: addedAllowlistedSenders,
+      removedAllowlistedSenders: removedAllowlistedSenders
+    });
+
+    OnRamp.AllowListConfigArgs[] memory allowListConfigArgsItems_3 = new OnRamp.AllowListConfigArgs[](1);
+    allowListConfigArgsItems_3[0] = allowListConfigArgs;
+
+    s_onRamp.applyAllowListUpdates(allowListConfigArgsItems_3);
+    assertEq(3, s_onRamp.getAllowedSendersList(DEST_CHAIN_SELECTOR).length);
+  }
+
+  function test_applyAllowList_Revert() public {
+    vm.stopPrank();
+    vm.startPrank(OWNER);
+
+    OnRamp.DestChainConfigArgs[] memory configArgs = new OnRamp.DestChainConfigArgs[](2);
+    configArgs[0] = OnRamp.DestChainConfigArgs({destChainSelector: DEST_CHAIN_SELECTOR, router: s_sourceRouter});
+    configArgs[1] = OnRamp.DestChainConfigArgs({destChainSelector: 9999, router: IRouter(address(9999))});
+    vm.expectEmit();
+    emit OnRamp.DestChainConfigSet(DEST_CHAIN_SELECTOR, 0, s_sourceRouter, false);
+    vm.expectEmit();
+    emit OnRamp.DestChainConfigSet(9999, 0, IRouter(address(9999)), false);
+    s_onRamp.applyDestChainConfigUpdates(configArgs);
+
+    uint64[] memory destinationChainSelectors = new uint64[](2);
+    destinationChainSelectors[0] = DEST_CHAIN_SELECTOR;
+    destinationChainSelectors[1] = uint64(99999);
+
+    address[] memory addedAllowlistedSenders = new address[](4);
+    addedAllowlistedSenders[0] = vm.addr(1);
+    addedAllowlistedSenders[1] = vm.addr(2);
+    addedAllowlistedSenders[2] = vm.addr(3);
+    addedAllowlistedSenders[3] = vm.addr(4);
+
+    OnRamp.AllowListConfigArgs memory allowListConfigArgs = OnRamp.AllowListConfigArgs({
+      allowListEnabled: true,
+      destChainSelector: DEST_CHAIN_SELECTOR,
+      addedAllowlistedSenders: addedAllowlistedSenders,
+      removedAllowlistedSenders: new address[](0)
+    });
+
+    OnRamp.AllowListConfigArgs[] memory applyAllowListConfigArgsItems = new OnRamp.AllowListConfigArgs[](1);
+    applyAllowListConfigArgsItems[0] = allowListConfigArgs;
+
+    vm.startPrank(STRANGER);
+    vm.expectRevert(OnRamp.OnlyCallableByOwnerOrAllowlistAdmin.selector);
+    s_onRamp.applyAllowListUpdates(applyAllowListConfigArgsItems);
+    vm.stopPrank();
+
+    applyAllowListConfigArgsItems[0].addedAllowlistedSenders[0] = address(0);
+    vm.expectRevert(abi.encodeWithSelector(OnRamp.InvalidAllowListRequest.selector, DEST_CHAIN_SELECTOR));
+    vm.startPrank(OWNER);
+    s_onRamp.applyAllowListUpdates(applyAllowListConfigArgsItems);
+    vm.stopPrank();
+  }
+}
diff --git a/contracts/src/v0.8/ccip/test/onRamp/OnRampSetup.t.sol b/contracts/src/v0.8/ccip/test/onRamp/OnRampSetup.t.sol
index a8d1919948..f43bce6a99 100644
--- a/contracts/src/v0.8/ccip/test/onRamp/OnRampSetup.t.sol
+++ b/contracts/src/v0.8/ccip/test/onRamp/OnRampSetup.t.sol
@@ -9,13 +9,13 @@ import {Router} from "../../Router.sol";
 import {Client} from "../../libraries/Client.sol";
 import {Internal} from "../../libraries/Internal.sol";
 import {OnRamp} from "../../onRamp/OnRamp.sol";
+import {FeeQuoterFeeSetup} from "../feeQuoter/FeeQuoterSetup.t.sol";
 import {MessageInterceptorHelper} from "../helpers/MessageInterceptorHelper.sol";
 import {OnRampHelper} from "../helpers/OnRampHelper.sol";
-import {PriceRegistryFeeSetup} from "../priceRegistry/PriceRegistry.t.sol";
 
 import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
-contract OnRampSetup is PriceRegistryFeeSetup {
+contract OnRampSetup is FeeQuoterFeeSetup {
   uint256 internal immutable i_tokenAmount0 = 9;
   uint256 internal immutable i_tokenAmount1 = 7;
 
@@ -84,9 +84,13 @@ contract OnRampSetup is PriceRegistryFeeSetup {
     );
   }
 
-  function _generateDynamicOnRampConfig(address priceRegistry) internal pure returns (OnRamp.DynamicConfig memory) {
-    return
-      OnRamp.DynamicConfig({priceRegistry: priceRegistry, messageValidator: address(0), feeAggregator: FEE_AGGREGATOR});
+  function _generateDynamicOnRampConfig(address feeQuoter) internal pure returns (OnRamp.DynamicConfig memory) {
+    return OnRamp.DynamicConfig({
+      feeQuoter: feeQuoter,
+      messageValidator: address(0),
+      feeAggregator: FEE_AGGREGATOR,
+      allowListAdmin: address(0)
+    });
   }
 
   // Slicing is only available for calldata. So we have to build a new bytes array.
@@ -117,7 +121,7 @@ contract OnRampSetup is PriceRegistryFeeSetup {
         nonceManager: nonceManager,
         tokenAdminRegistry: tokenAdminRegistry
       }),
-      _generateDynamicOnRampConfig(address(s_priceRegistry)),
+      _generateDynamicOnRampConfig(address(s_feeQuoter)),
       _generateDestChainConfigArgs(router)
     );
 
@@ -162,6 +166,6 @@ contract OnRampSetup is PriceRegistryFeeSetup {
   }
 
   function _assertDynamicConfigsEqual(OnRamp.DynamicConfig memory a, OnRamp.DynamicConfig memory b) internal pure {
-    assertEq(a.priceRegistry, b.priceRegistry);
+    assertEq(a.feeQuoter, b.feeQuoter);
   }
 }
diff --git a/contracts/src/v0.8/ccip/test/pools/HybridLockReleaseUSDCTokenPool.t.sol b/contracts/src/v0.8/ccip/test/pools/HybridLockReleaseUSDCTokenPool.t.sol
new file mode 100644
index 0000000000..96216c6fcc
--- /dev/null
+++ b/contracts/src/v0.8/ccip/test/pools/HybridLockReleaseUSDCTokenPool.t.sol
@@ -0,0 +1,661 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity 0.8.24;
+
+import {ILiquidityContainer} from "../../../liquiditymanager/interfaces/ILiquidityContainer.sol";
+import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol";
+import {IPoolV1} from "../../interfaces/IPool.sol";
+import {ITokenMessenger} from "../../pools/USDC/ITokenMessenger.sol";
+
+import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
+import {Router} from "../../Router.sol";
+import {Internal} from "../../libraries/Internal.sol";
+import {Pool} from "../../libraries/Pool.sol";
+import {RateLimiter} from "../../libraries/RateLimiter.sol";
+
+import {TokenPool} from "../../pools/TokenPool.sol";
+import {HybridLockReleaseUSDCTokenPool} from "../../pools/USDC/HybridLockReleaseUSDCTokenPool.sol";
+import {USDCBridgeMigrator} from "../../pools/USDC/USDCBridgeMigrator.sol";
+import {USDCTokenPool} from "../../pools/USDC/USDCTokenPool.sol";
+import {BaseTest} from "../BaseTest.t.sol";
+import {USDCTokenPoolHelper} from "../helpers/USDCTokenPoolHelper.sol";
+import {MockE2EUSDCTransmitter} from "../mocks/MockE2EUSDCTransmitter.sol";
+import {MockUSDCTokenMessenger} from "../mocks/MockUSDCTokenMessenger.sol";
+
+import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
+
+contract USDCTokenPoolSetup is BaseTest {
+  IBurnMintERC20 internal s_token;
+  MockUSDCTokenMessenger internal s_mockUSDC;
+  MockE2EUSDCTransmitter internal s_mockUSDCTransmitter;
+  uint32 internal constant USDC_DEST_TOKEN_GAS = 150_000;
+
+  struct USDCMessage {
+    uint32 version;
+    uint32 sourceDomain;
+    uint32 destinationDomain;
+    uint64 nonce;
+    bytes32 sender;
+    bytes32 recipient;
+    bytes32 destinationCaller;
+    bytes messageBody;
+  }
+
+  uint32 internal constant SOURCE_DOMAIN_IDENTIFIER = 0x02020202;
+  uint32 internal constant DEST_DOMAIN_IDENTIFIER = 0;
+
+  bytes32 internal constant SOURCE_CHAIN_TOKEN_SENDER = bytes32(uint256(uint160(0x01111111221)));
+  address internal constant SOURCE_CHAIN_USDC_POOL = address(0x23789765456789);
+  address internal constant DEST_CHAIN_USDC_POOL = address(0x987384873458734);
+  address internal constant DEST_CHAIN_USDC_TOKEN = address(0x23598918358198766);
+
+  address internal s_routerAllowedOnRamp = address(3456);
+  address internal s_routerAllowedOffRamp = address(234);
+  Router internal s_router;
+
+  HybridLockReleaseUSDCTokenPool internal s_usdcTokenPool;
+  HybridLockReleaseUSDCTokenPool internal s_usdcTokenPoolTransferLiquidity;
+  address[] internal s_allowedList;
+
+  function setUp() public virtual override {
+    BaseTest.setUp();
+    BurnMintERC677 usdcToken = new BurnMintERC677("LINK", "LNK", 18, 0);
+    s_token = usdcToken;
+    deal(address(s_token), OWNER, type(uint256).max);
+    setUpRamps();
+
+    s_mockUSDCTransmitter = new MockE2EUSDCTransmitter(0, DEST_DOMAIN_IDENTIFIER, address(s_token));
+    s_mockUSDC = new MockUSDCTokenMessenger(0, address(s_mockUSDCTransmitter));
+
+    usdcToken.grantMintAndBurnRoles(address(s_mockUSDCTransmitter));
+
+    s_usdcTokenPool =
+      new HybridLockReleaseUSDCTokenPool(s_mockUSDC, s_token, new address[](0), address(s_mockRMN), address(s_router));
+
+    s_usdcTokenPoolTransferLiquidity =
+      new HybridLockReleaseUSDCTokenPool(s_mockUSDC, s_token, new address[](0), address(s_mockRMN), address(s_router));
+
+    usdcToken.grantMintAndBurnRoles(address(s_mockUSDC));
+    usdcToken.grantMintAndBurnRoles(address(s_usdcTokenPool));
+
+    TokenPool.ChainUpdate[] memory chainUpdates = new TokenPool.ChainUpdate[](2);
+    chainUpdates[0] = TokenPool.ChainUpdate({
+      remoteChainSelector: SOURCE_CHAIN_SELECTOR,
+      remotePoolAddress: abi.encode(SOURCE_CHAIN_USDC_POOL),
+      remoteTokenAddress: abi.encode(address(s_token)),
+      allowed: true,
+      outboundRateLimiterConfig: _getOutboundRateLimiterConfig(),
+      inboundRateLimiterConfig: _getInboundRateLimiterConfig()
+    });
+    chainUpdates[1] = TokenPool.ChainUpdate({
+      remoteChainSelector: DEST_CHAIN_SELECTOR,
+      remotePoolAddress: abi.encode(DEST_CHAIN_USDC_POOL),
+      remoteTokenAddress: abi.encode(DEST_CHAIN_USDC_TOKEN),
+      allowed: true,
+      outboundRateLimiterConfig: _getOutboundRateLimiterConfig(),
+      inboundRateLimiterConfig: _getInboundRateLimiterConfig()
+    });
+
+    s_usdcTokenPool.applyChainUpdates(chainUpdates);
+
+    USDCTokenPool.DomainUpdate[] memory domains = new USDCTokenPool.DomainUpdate[](1);
+    domains[0] = USDCTokenPool.DomainUpdate({
+      destChainSelector: DEST_CHAIN_SELECTOR,
+      domainIdentifier: 9999,
+      allowedCaller: keccak256("allowedCaller"),
+      enabled: true
+    });
+
+    s_usdcTokenPool.setDomains(domains);
+
+    vm.expectEmit();
+    emit HybridLockReleaseUSDCTokenPool.LiquidityProviderSet(address(0), OWNER, DEST_CHAIN_SELECTOR);
+
+    s_usdcTokenPool.setLiquidityProvider(DEST_CHAIN_SELECTOR, OWNER);
+  }
+
+  function setUpRamps() internal {
+    s_router = new Router(address(s_token), address(s_mockRMN));
+
+    Router.OnRamp[] memory onRampUpdates = new Router.OnRamp[](1);
+    onRampUpdates[0] = Router.OnRamp({destChainSelector: DEST_CHAIN_SELECTOR, onRamp: s_routerAllowedOnRamp});
+    Router.OffRamp[] memory offRampUpdates = new Router.OffRamp[](1);
+    address[] memory offRamps = new address[](1);
+    offRamps[0] = s_routerAllowedOffRamp;
+    offRampUpdates[0] = Router.OffRamp({sourceChainSelector: SOURCE_CHAIN_SELECTOR, offRamp: offRamps[0]});
+
+    s_router.applyRampUpdates(onRampUpdates, new Router.OffRamp[](0), offRampUpdates);
+  }
+
+  function _generateUSDCMessage(USDCMessage memory usdcMessage) internal pure returns (bytes memory) {
+    return abi.encodePacked(
+      usdcMessage.version,
+      usdcMessage.sourceDomain,
+      usdcMessage.destinationDomain,
+      usdcMessage.nonce,
+      usdcMessage.sender,
+      usdcMessage.recipient,
+      usdcMessage.destinationCaller,
+      usdcMessage.messageBody
+    );
+  }
+}
+
+contract HybridUSDCTokenPoolTests is USDCTokenPoolSetup {
+  function test_LockOrBurn_onLockReleaseMechanism_Success() public {
+    bytes32 receiver = bytes32(uint256(uint160(STRANGER)));
+
+    // Mark the destination chain as supporting CCTP, so use L/R instead.
+    uint64[] memory destChainAdds = new uint64[](1);
+    destChainAdds[0] = DEST_CHAIN_SELECTOR;
+
+    s_usdcTokenPool.updateChainSelectorMechanisms(new uint64[](0), destChainAdds);
+
+    assertTrue(
+      s_usdcTokenPool.shouldUseLockRelease(DEST_CHAIN_SELECTOR),
+      "Lock/Release mech not configured for outgoing message to DEST_CHAIN_SELECTOR"
+    );
+
+    uint256 amount = 1e6;
+
+    s_token.transfer(address(s_usdcTokenPool), amount);
+
+    vm.startPrank(s_routerAllowedOnRamp);
+
+    vm.expectEmit();
+    emit TokenPool.Locked(s_routerAllowedOnRamp, amount);
+
+    s_usdcTokenPool.lockOrBurn(
+      Pool.LockOrBurnInV1({
+        originalSender: OWNER,
+        receiver: abi.encodePacked(receiver),
+        amount: amount,
+        remoteChainSelector: DEST_CHAIN_SELECTOR,
+        localToken: address(s_token)
+      })
+    );
+
+    assertEq(s_token.balanceOf(address(s_usdcTokenPool)), amount, "Incorrect token amount in the tokenPool");
+  }
+
+  function test_MintOrRelease_OnLockReleaseMechanism_Success() public {
+    address recipient = address(1234);
+
+    // Designate the SOURCE_CHAIN as not using native-USDC, and so the L/R mechanism must be used instead
+    uint64[] memory destChainAdds = new uint64[](1);
+    destChainAdds[0] = SOURCE_CHAIN_SELECTOR;
+
+    s_usdcTokenPool.updateChainSelectorMechanisms(new uint64[](0), destChainAdds);
+
+    assertTrue(
+      s_usdcTokenPool.shouldUseLockRelease(SOURCE_CHAIN_SELECTOR),
+      "Lock/Release mech not configured for incoming message from SOURCE_CHAIN_SELECTOR"
+    );
+
+    vm.startPrank(OWNER);
+    s_usdcTokenPool.setLiquidityProvider(SOURCE_CHAIN_SELECTOR, OWNER);
+
+    // Add 1e12 liquidity so that there's enough to release
+    vm.startPrank(s_usdcTokenPool.getLiquidityProvider(SOURCE_CHAIN_SELECTOR));
+
+    s_token.approve(address(s_usdcTokenPool), type(uint256).max);
+
+    uint256 liquidityAmount = 1e12;
+    s_usdcTokenPool.provideLiquidity(SOURCE_CHAIN_SELECTOR, liquidityAmount);
+
+    Internal.SourceTokenData memory sourceTokenData = Internal.SourceTokenData({
+      sourcePoolAddress: abi.encode(SOURCE_CHAIN_USDC_POOL),
+      destTokenAddress: abi.encode(address(s_usdcTokenPool)),
+      extraData: abi.encode(USDCTokenPool.SourceTokenDataPayload({nonce: 1, sourceDomain: SOURCE_DOMAIN_IDENTIFIER})),
+      destGasAmount: USDC_DEST_TOKEN_GAS
+    });
+
+    uint256 amount = 1e6;
+
+    vm.startPrank(s_routerAllowedOffRamp);
+
+    vm.expectEmit();
+    emit TokenPool.Released(s_routerAllowedOffRamp, recipient, amount);
+
+    Pool.ReleaseOrMintOutV1 memory poolReturnDataV1 = s_usdcTokenPool.releaseOrMint(
+      Pool.ReleaseOrMintInV1({
+        originalSender: abi.encode(OWNER),
+        receiver: recipient,
+        amount: amount,
+        localToken: address(s_token),
+        remoteChainSelector: SOURCE_CHAIN_SELECTOR,
+        sourcePoolAddress: sourceTokenData.sourcePoolAddress,
+        sourcePoolData: "",
+        offchainTokenData: ""
+      })
+    );
+
+    assertEq(poolReturnDataV1.destinationAmount, amount, "destinationAmount and actual amount transferred differ");
+
+    // Simulate the off-ramp forwarding tokens to the recipient on destination chain
+    // s_token.transfer(recipient, amount);
+
+    assertEq(
+      s_token.balanceOf(address(s_usdcTokenPool)),
+      liquidityAmount - amount,
+      "Incorrect remaining liquidity in TokenPool"
+    );
+    assertEq(s_token.balanceOf(recipient), amount, "Tokens not transferred to recipient");
+  }
+
+  function test_LockOrBurn_PrimaryMechanism_Success() public {
+    bytes32 receiver = bytes32(uint256(uint160(STRANGER)));
+    uint256 amount = 1;
+
+    vm.startPrank(OWNER);
+
+    s_token.transfer(address(s_usdcTokenPool), amount);
+
+    vm.startPrank(s_routerAllowedOnRamp);
+
+    USDCTokenPool.Domain memory expectedDomain = s_usdcTokenPool.getDomain(DEST_CHAIN_SELECTOR);
+
+    vm.expectEmit();
+    emit RateLimiter.TokensConsumed(amount);
+
+    vm.expectEmit();
+    emit ITokenMessenger.DepositForBurn(
+      s_mockUSDC.s_nonce(),
+      address(s_token),
+      amount,
+      address(s_usdcTokenPool),
+      receiver,
+      expectedDomain.domainIdentifier,
+      s_mockUSDC.DESTINATION_TOKEN_MESSENGER(),
+      expectedDomain.allowedCaller
+    );
+
+    vm.expectEmit();
+    emit TokenPool.Burned(s_routerAllowedOnRamp, amount);
+
+    Pool.LockOrBurnOutV1 memory poolReturnDataV1 = s_usdcTokenPool.lockOrBurn(
+      Pool.LockOrBurnInV1({
+        originalSender: OWNER,
+        receiver: abi.encodePacked(receiver),
+        amount: amount,
+        remoteChainSelector: DEST_CHAIN_SELECTOR,
+        localToken: address(s_token)
+      })
+    );
+
+    uint64 nonce = abi.decode(poolReturnDataV1.destPoolData, (uint64));
+    assertEq(s_mockUSDC.s_nonce() - 1, nonce);
+  }
+
+  // https://etherscan.io/tx/0xac9f501fe0b76df1f07a22e1db30929fd12524bc7068d74012dff948632f0883
+  function test_MintOrRelease_incomingMessageWithPrimaryMechanism() public {
+    bytes memory encodedUsdcMessage =
+      hex"000000000000000300000000000000000000127a00000000000000000000000019330d10d9cc8751218eaf51e8885d058642e08a000000000000000000000000bd3fa81b58ba92a82136038b25adec7066af3155000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e58310000000000000000000000004af08f56978be7dce2d1be3c65c005b41e79401c000000000000000000000000000000000000000000000000000000002057ff7a0000000000000000000000003a23f943181408eac424116af7b7790c94cb97a50000000000000000000000000000000000000000000000000000000000000000000000000000008274119237535fd659626b090f87e365ff89ebc7096bb32e8b0e85f155626b73ae7c4bb2485c184b7cc3cf7909045487890b104efb62ae74a73e32901bdcec91df1bb9ee08ccb014fcbcfe77b74d1263fd4e0b0e8de05d6c9a5913554364abfd5ea768b222f50c715908183905d74044bb2b97527c7e70ae7983c443a603557cac3b1c000000000000000000000000000000000000000000000000000000000000";
+    bytes memory attestation = bytes("attestation bytes");
+
+    uint32 nonce = 4730;
+    uint32 sourceDomain = 3;
+    uint256 amount = 100;
+
+    Internal.SourceTokenData memory sourceTokenData = Internal.SourceTokenData({
+      sourcePoolAddress: abi.encode(SOURCE_CHAIN_USDC_POOL),
+      destTokenAddress: abi.encode(address(s_usdcTokenPool)),
+      extraData: abi.encode(USDCTokenPool.SourceTokenDataPayload({nonce: nonce, sourceDomain: sourceDomain})),
+      destGasAmount: USDC_DEST_TOKEN_GAS
+    });
+
+    // The mocked receiver does not release the token to the pool, so we manually do it here
+    deal(address(s_token), address(s_usdcTokenPool), amount);
+
+    bytes memory offchainTokenData =
+      abi.encode(USDCTokenPool.MessageAndAttestation({message: encodedUsdcMessage, attestation: attestation}));
+
+    vm.expectCall(
+      address(s_mockUSDCTransmitter),
+      abi.encodeWithSelector(MockE2EUSDCTransmitter.receiveMessage.selector, encodedUsdcMessage, attestation)
+    );
+
+    vm.startPrank(s_routerAllowedOffRamp);
+    s_usdcTokenPool.releaseOrMint(
+      Pool.ReleaseOrMintInV1({
+        originalSender: abi.encode(OWNER),
+        receiver: OWNER,
+        amount: amount,
+        localToken: address(s_token),
+        remoteChainSelector: SOURCE_CHAIN_SELECTOR,
+        sourcePoolAddress: sourceTokenData.sourcePoolAddress,
+        sourcePoolData: sourceTokenData.extraData,
+        offchainTokenData: offchainTokenData
+      })
+    );
+  }
+
+  function test_LockOrBurn_LocKReleaseMechanism_then_switchToPrimary_Success() public {
+    // Test Enabling the LR mechanism and sending an outgoing message
+    test_LockOrBurn_PrimaryMechanism_Success();
+
+    // Disable the LR mechanism so that primary CCTP is used and then attempt to send a message
+    uint64[] memory destChainRemoves = new uint64[](1);
+    destChainRemoves[0] = DEST_CHAIN_SELECTOR;
+
+    vm.startPrank(OWNER);
+
+    vm.expectEmit();
+    emit HybridLockReleaseUSDCTokenPool.LockReleaseDisabled(DEST_CHAIN_SELECTOR);
+
+    s_usdcTokenPool.updateChainSelectorMechanisms(destChainRemoves, new uint64[](0));
+
+    // Send an outgoing message
+    test_LockOrBurn_PrimaryMechanism_Success();
+  }
+
+  function test_MintOrRelease_OnLockReleaseMechanism_then_switchToPrimary_Success() public {
+    test_MintOrRelease_OnLockReleaseMechanism_Success();
+
+    // Disable the LR mechanism so that primary CCTP is used and then attempt to send a message
+    uint64[] memory destChainRemoves = new uint64[](1);
+    destChainRemoves[0] = SOURCE_CHAIN_SELECTOR;
+
+    vm.startPrank(OWNER);
+
+    vm.expectEmit();
+    emit HybridLockReleaseUSDCTokenPool.LockReleaseDisabled(SOURCE_CHAIN_SELECTOR);
+
+    s_usdcTokenPool.updateChainSelectorMechanisms(destChainRemoves, new uint64[](0));
+
+    vm.expectEmit();
+    emit HybridLockReleaseUSDCTokenPool.LiquidityProviderSet(OWNER, OWNER, SOURCE_CHAIN_SELECTOR);
+
+    s_usdcTokenPool.setLiquidityProvider(SOURCE_CHAIN_SELECTOR, OWNER);
+
+    // Test incoming on the primary mechanism after disable LR, simulating Circle's new support for CCTP on
+    // DEST_CHAIN_SELECTOR
+    test_MintOrRelease_incomingMessageWithPrimaryMechanism();
+  }
+
+  function test_withdrawLiquidity_Success() public {
+    uint256 liquidityAmount = 1e12;
+
+    vm.startPrank(OWNER);
+    s_token.approve(address(s_usdcTokenPool), type(uint256).max);
+
+    s_usdcTokenPool.setLiquidityProvider(SOURCE_CHAIN_SELECTOR, OWNER);
+    assertEq(s_usdcTokenPool.getLiquidityProvider(SOURCE_CHAIN_SELECTOR), OWNER, "Owner is not Rebalancer");
+
+    s_usdcTokenPool.provideLiquidity(SOURCE_CHAIN_SELECTOR, liquidityAmount);
+
+    assertEq(s_usdcTokenPool.getLockedTokensForChain(SOURCE_CHAIN_SELECTOR), liquidityAmount);
+
+    assertEq(
+      s_token.balanceOf(address(s_usdcTokenPool)),
+      liquidityAmount,
+      "Available tokens doesn't match provided liquidity amount"
+    );
+
+    uint256 withdrawalAmount = liquidityAmount / 2; // Withdraw half of the liquidity
+
+    vm.expectEmit();
+    emit ILiquidityContainer.LiquidityRemoved(OWNER, withdrawalAmount);
+
+    s_usdcTokenPool.withdrawLiquidity(SOURCE_CHAIN_SELECTOR, withdrawalAmount);
+
+    assertEq(
+      s_usdcTokenPool.getLockedTokensForChain(SOURCE_CHAIN_SELECTOR),
+      liquidityAmount - withdrawalAmount,
+      "Remaining liquidity incorrect"
+    );
+    assertEq(
+      s_token.balanceOf(address(s_usdcTokenPool)),
+      liquidityAmount - withdrawalAmount,
+      "Available tokens doesn't match provided liquidity amount"
+    );
+  }
+
+  function test_LockOrBurn_WhileMigrationPause_Revert() public {
+    // Create a fake migration proposal
+    s_usdcTokenPool.proposeCCTPMigration(DEST_CHAIN_SELECTOR);
+
+    assertEq(s_usdcTokenPool.getCurrentProposedCCTPChainMigration(), DEST_CHAIN_SELECTOR);
+
+    bytes32 receiver = bytes32(uint256(uint160(STRANGER)));
+
+    // Mark the destination chain as supporting CCTP, so use L/R instead.
+    uint64[] memory destChainAdds = new uint64[](1);
+    destChainAdds[0] = DEST_CHAIN_SELECTOR;
+
+    s_usdcTokenPool.updateChainSelectorMechanisms(new uint64[](0), destChainAdds);
+
+    assertTrue(
+      s_usdcTokenPool.shouldUseLockRelease(DEST_CHAIN_SELECTOR),
+      "Lock Release mech not configured for outgoing message to DEST_CHAIN_SELECTOR"
+    );
+
+    uint256 amount = 1e6;
+
+    s_token.transfer(address(s_usdcTokenPool), amount);
+
+    vm.startPrank(s_routerAllowedOnRamp);
+
+    // Expect the lockOrBurn to fail because a pending CCTP-Migration has paused outgoing messages on CCIP
+    vm.expectRevert(
+      abi.encodeWithSelector(HybridLockReleaseUSDCTokenPool.LanePausedForCCTPMigration.selector, DEST_CHAIN_SELECTOR)
+    );
+
+    s_usdcTokenPool.lockOrBurn(
+      Pool.LockOrBurnInV1({
+        originalSender: OWNER,
+        receiver: abi.encodePacked(receiver),
+        amount: amount,
+        remoteChainSelector: DEST_CHAIN_SELECTOR,
+        localToken: address(s_token)
+      })
+    );
+  }
+}
+
+contract HybridUSDCTokenPoolMigrationTests is HybridUSDCTokenPoolTests {
+  function test_lockOrBurn_then_BurnInCCTPMigration_Success() public {
+    bytes32 receiver = bytes32(uint256(uint160(STRANGER)));
+    address CIRCLE = makeAddr("CIRCLE CCTP Migrator");
+
+    // Mark the destination chain as supporting CCTP, so use L/R instead.
+    uint64[] memory destChainAdds = new uint64[](1);
+    destChainAdds[0] = DEST_CHAIN_SELECTOR;
+
+    s_usdcTokenPool.updateChainSelectorMechanisms(new uint64[](0), destChainAdds);
+
+    assertTrue(
+      s_usdcTokenPool.shouldUseLockRelease(DEST_CHAIN_SELECTOR),
+      "Lock/Release mech not configured for outgoing message to DEST_CHAIN_SELECTOR"
+    );
+
+    uint256 amount = 1e6;
+
+    s_token.transfer(address(s_usdcTokenPool), amount);
+
+    vm.startPrank(s_routerAllowedOnRamp);
+
+    vm.expectEmit();
+    emit TokenPool.Locked(s_routerAllowedOnRamp, amount);
+
+    s_usdcTokenPool.lockOrBurn(
+      Pool.LockOrBurnInV1({
+        originalSender: OWNER,
+        receiver: abi.encodePacked(receiver),
+        amount: amount,
+        remoteChainSelector: DEST_CHAIN_SELECTOR,
+        localToken: address(s_token)
+      })
+    );
+
+    // Ensure that the tokens are properly locked
+    assertEq(s_token.balanceOf(address(s_usdcTokenPool)), amount, "Incorrect token amount in the tokenPool");
+
+    assertEq(
+      s_usdcTokenPool.getLockedTokensForChain(DEST_CHAIN_SELECTOR),
+      amount,
+      "Internal locked token accounting is incorrect"
+    );
+
+    vm.startPrank(OWNER);
+
+    vm.expectEmit();
+    emit USDCBridgeMigrator.CircleMigratorAddressSet(CIRCLE);
+
+    s_usdcTokenPool.setCircleMigratorAddress(CIRCLE);
+
+    vm.expectEmit();
+    emit USDCBridgeMigrator.CCTPMigrationProposed(DEST_CHAIN_SELECTOR);
+
+    // Propose the migration to CCTP
+    s_usdcTokenPool.proposeCCTPMigration(DEST_CHAIN_SELECTOR);
+
+    assertEq(
+      s_usdcTokenPool.getCurrentProposedCCTPChainMigration(),
+      DEST_CHAIN_SELECTOR,
+      "Current proposed chain migration does not match expected for DEST_CHAIN_SELECTOR"
+    );
+
+    // Impersonate the set circle address and execute the proposal
+    vm.startPrank(CIRCLE);
+
+    vm.expectEmit();
+    emit USDCBridgeMigrator.CCTPMigrationExecuted(DEST_CHAIN_SELECTOR, amount);
+
+    // Ensure the call to the burn function is properly
+    vm.expectCall(address(s_token), abi.encodeWithSelector(bytes4(keccak256("burn(uint256)")), amount));
+
+    s_usdcTokenPool.burnLockedUSDC();
+
+    // Assert that the tokens were actually burned
+    assertEq(s_token.balanceOf(address(s_usdcTokenPool)), 0, "Tokens were not burned out of the tokenPool");
+
+    // Ensure the proposal slot was cleared and there's no tokens locked for the destination chain anymore
+    assertEq(s_usdcTokenPool.getCurrentProposedCCTPChainMigration(), 0, "Proposal Slot should be empty");
+    assertEq(
+      s_usdcTokenPool.getLockedTokensForChain(DEST_CHAIN_SELECTOR),
+      0,
+      "No tokens should be locked for DEST_CHAIN_SELECTOR after CCTP-approved burn"
+    );
+
+    assertFalse(
+      s_usdcTokenPool.shouldUseLockRelease(DEST_CHAIN_SELECTOR), "Lock/Release mech should be disabled after a burn"
+    );
+
+    test_LockOrBurn_PrimaryMechanism_Success();
+  }
+
+  function test_cancelExistingCCTPMigrationProposal() public {
+    vm.startPrank(OWNER);
+
+    vm.expectEmit();
+    emit USDCBridgeMigrator.CCTPMigrationProposed(DEST_CHAIN_SELECTOR);
+
+    s_usdcTokenPool.proposeCCTPMigration(DEST_CHAIN_SELECTOR);
+
+    assertEq(
+      s_usdcTokenPool.getCurrentProposedCCTPChainMigration(),
+      DEST_CHAIN_SELECTOR,
+      "migration proposal should exist, but doesn't"
+    );
+
+    vm.expectEmit();
+    emit USDCBridgeMigrator.CCTPMigrationCancelled(DEST_CHAIN_SELECTOR);
+
+    s_usdcTokenPool.cancelExistingCCTPMigrationProposal();
+
+    assertEq(
+      s_usdcTokenPool.getCurrentProposedCCTPChainMigration(),
+      0,
+      "migration proposal exists, but shouldn't after being cancelled"
+    );
+
+    vm.expectRevert(USDCBridgeMigrator.NoExistingMigrationProposal.selector);
+    s_usdcTokenPool.cancelExistingCCTPMigrationProposal();
+  }
+
+  function test_burnLockedUSDC_invalidPermissions_Revert() public {
+    address CIRCLE = makeAddr("CIRCLE");
+
+    vm.startPrank(OWNER);
+
+    // Set the circle migrator address for later, but don't start pranking as it yet
+    s_usdcTokenPool.setCircleMigratorAddress(CIRCLE);
+
+    vm.expectRevert(abi.encodeWithSelector(USDCBridgeMigrator.onlyCircle.selector));
+
+    // Should fail because only Circle can call this function
+    s_usdcTokenPool.burnLockedUSDC();
+
+    vm.startPrank(CIRCLE);
+
+    vm.expectRevert(abi.encodeWithSelector(USDCBridgeMigrator.ExistingMigrationProposal.selector));
+    s_usdcTokenPool.burnLockedUSDC();
+  }
+
+  function test_transferLiquidity_Success() public {
+    // Set as the OWNER so we can provide liquidity
+    vm.startPrank(OWNER);
+    s_usdcTokenPoolTransferLiquidity.setLiquidityProvider(DEST_CHAIN_SELECTOR, OWNER);
+
+    s_token.approve(address(s_usdcTokenPoolTransferLiquidity), type(uint256).max);
+
+    uint256 liquidityAmount = 1e9;
+
+    // Provide 1000 USDC as liquidity
+    s_usdcTokenPoolTransferLiquidity.provideLiquidity(DEST_CHAIN_SELECTOR, liquidityAmount);
+
+    // Set the new token pool as the rebalancer
+    s_usdcTokenPoolTransferLiquidity.setLiquidityProvider(DEST_CHAIN_SELECTOR, address(s_usdcTokenPool));
+
+    vm.expectEmit();
+    emit ILiquidityContainer.LiquidityRemoved(address(s_usdcTokenPool), liquidityAmount);
+
+    vm.expectEmit();
+    emit HybridLockReleaseUSDCTokenPool.LiquidityTransferred(
+      address(s_usdcTokenPoolTransferLiquidity), DEST_CHAIN_SELECTOR, liquidityAmount
+    );
+
+    s_usdcTokenPool.transferLiquidity(address(s_usdcTokenPoolTransferLiquidity), DEST_CHAIN_SELECTOR, liquidityAmount);
+
+    assertEq(
+      s_usdcTokenPool.getLockedTokensForChain(DEST_CHAIN_SELECTOR),
+      liquidityAmount,
+      "Tokens locked for dest chain doesn't match expected amount in storage"
+    );
+
+    assertEq(
+      s_usdcTokenPoolTransferLiquidity.getLockedTokensForChain(DEST_CHAIN_SELECTOR),
+      0,
+      "Tokens locked for dest chain in old token pool doesn't match expected amount in storage"
+    );
+
+    assertEq(
+      s_token.balanceOf(address(s_usdcTokenPool)),
+      liquidityAmount,
+      "Liquidity amount of tokens should be new in new pool, but aren't"
+    );
+  }
+
+  function test_cannotModifyLiquidityWithoutPermissions_Revert() public {
+    address randomAddr = makeAddr("RANDOM");
+
+    vm.startPrank(randomAddr);
+
+    vm.expectRevert(abi.encodeWithSelector(TokenPool.Unauthorized.selector, randomAddr));
+
+    // Revert because there's insufficient permissions for the DEST_CHAIN_SELECTOR to provide liquidity
+    s_usdcTokenPool.provideLiquidity(DEST_CHAIN_SELECTOR, 1e6);
+
+    vm.expectRevert(abi.encodeWithSelector(TokenPool.Unauthorized.selector, randomAddr));
+
+    // Revert because there's insufficient permissions for the DEST_CHAIN_SELECTOR to withdraw liquidity
+    s_usdcTokenPool.withdrawLiquidity(DEST_CHAIN_SELECTOR, 1e6);
+  }
+
+  function test_cannotCancelANonExistentMigrationProposal() public {
+    vm.expectRevert(USDCBridgeMigrator.NoExistingMigrationProposal.selector);
+
+    // Proposal to migrate doesn't exist, and so the chain selector is zero, and therefore should revert
+    s_usdcTokenPool.cancelExistingCCTPMigrationProposal();
+  }
+}
diff --git a/contracts/src/v0.8/ccip/test/pools/USDCTokenPool.t.sol b/contracts/src/v0.8/ccip/test/pools/USDCTokenPool.t.sol
index e60d5542f4..b71094a310 100644
--- a/contracts/src/v0.8/ccip/test/pools/USDCTokenPool.t.sol
+++ b/contracts/src/v0.8/ccip/test/pools/USDCTokenPool.t.sol
@@ -352,7 +352,7 @@ contract USDCTokenPool_releaseOrMint is USDCTokenPoolSetup {
         bytes32(uint256(uint160(recipient))),
         amount,
         bytes32(uint256(uint160(OWNER)))
-        )
+      )
     });
 
     bytes memory message = _generateUSDCMessage(usdcMessage);
@@ -363,7 +363,7 @@ contract USDCTokenPool_releaseOrMint is USDCTokenPoolSetup {
       destTokenAddress: abi.encode(address(s_usdcTokenPool)),
       extraData: abi.encode(
         USDCTokenPool.SourceTokenDataPayload({nonce: usdcMessage.nonce, sourceDomain: SOURCE_DOMAIN_IDENTIFIER})
-        ),
+      ),
       destGasAmount: USDC_DEST_TOKEN_GAS
     });
 
@@ -460,7 +460,7 @@ contract USDCTokenPool_releaseOrMint is USDCTokenPoolSetup {
         bytes32(uint256(uint160(OWNER))),
         amount,
         bytes32(uint256(uint160(OWNER)))
-        )
+      )
     });
 
     Internal.SourceTokenData memory sourceTokenData = Internal.SourceTokenData({
@@ -468,7 +468,7 @@ contract USDCTokenPool_releaseOrMint is USDCTokenPoolSetup {
       destTokenAddress: abi.encode(address(s_usdcTokenPool)),
       extraData: abi.encode(
         USDCTokenPool.SourceTokenDataPayload({nonce: usdcMessage.nonce, sourceDomain: SOURCE_DOMAIN_IDENTIFIER})
-        ),
+      ),
       destGasAmount: USDC_DEST_TOKEN_GAS
     });
 
diff --git a/contracts/src/v0.8/ccip/test/rateLimiter/AggregateRateLimiter.t.sol b/contracts/src/v0.8/ccip/test/rateLimiter/AggregateRateLimiter.t.sol
index af970b0f92..318821c441 100644
--- a/contracts/src/v0.8/ccip/test/rateLimiter/AggregateRateLimiter.t.sol
+++ b/contracts/src/v0.8/ccip/test/rateLimiter/AggregateRateLimiter.t.sol
@@ -5,12 +5,13 @@ import {AggregateRateLimiter} from "../../AggregateRateLimiter.sol";
 import {Client} from "../../libraries/Client.sol";
 import {Internal} from "../../libraries/Internal.sol";
 import {RateLimiter} from "../../libraries/RateLimiter.sol";
+
+import {FeeQuoterSetup} from "../feeQuoter/FeeQuoterSetup.t.sol";
 import {AggregateRateLimiterHelper} from "../helpers/AggregateRateLimiterHelper.sol";
-import {PriceRegistrySetup} from "../priceRegistry/PriceRegistrySetup.t.sol";
 
 import {stdError} from "forge-std/Test.sol";
 
-contract AggregateTokenLimiterSetup is PriceRegistrySetup {
+contract AggregateTokenLimiterSetup is FeeQuoterSetup {
   AggregateRateLimiterHelper internal s_rateLimiter;
   RateLimiter.Config internal s_config;
 
@@ -18,10 +19,10 @@ contract AggregateTokenLimiterSetup is PriceRegistrySetup {
   uint224 internal constant TOKEN_PRICE = 4e18;
 
   function setUp() public virtual override {
-    PriceRegistrySetup.setUp();
+    FeeQuoterSetup.setUp();
 
     Internal.PriceUpdates memory priceUpdates = _getSingleTokenPriceUpdateStruct(TOKEN, TOKEN_PRICE);
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
 
     s_config = RateLimiter.Config({isEnabled: true, rate: 5, capacity: 100});
     s_rateLimiter = new AggregateRateLimiterHelper(s_config);
@@ -219,7 +220,7 @@ contract AggregateTokenLimiter_getTokenValue is AggregateTokenLimiterSetup {
   function test_GetTokenValue_Success() public view {
     uint256 numberOfTokens = 10;
     Client.EVMTokenAmount memory tokenAmount = Client.EVMTokenAmount({token: TOKEN, amount: 10});
-    uint256 value = s_rateLimiter.getTokenValue(tokenAmount, s_priceRegistry);
+    uint256 value = s_rateLimiter.getTokenValue(tokenAmount, s_feeQuoter);
     assertEq(value, (numberOfTokens * TOKEN_PRICE) / 1e18);
   }
 
@@ -229,6 +230,6 @@ contract AggregateTokenLimiter_getTokenValue is AggregateTokenLimiterSetup {
     Client.EVMTokenAmount memory tokenAmount = Client.EVMTokenAmount({token: tokenWithNoPrice, amount: 10});
 
     vm.expectRevert(abi.encodeWithSelector(AggregateRateLimiter.PriceNotFoundForToken.selector, tokenWithNoPrice));
-    s_rateLimiter.getTokenValue(tokenAmount, s_priceRegistry);
+    s_rateLimiter.getTokenValue(tokenAmount, s_feeQuoter);
   }
 }
diff --git a/contracts/src/v0.8/ccip/test/rateLimiter/MultiAggregateRateLimiter.t.sol b/contracts/src/v0.8/ccip/test/rateLimiter/MultiAggregateRateLimiter.t.sol
index 292c4533e4..a7d73cc8b3 100644
--- a/contracts/src/v0.8/ccip/test/rateLimiter/MultiAggregateRateLimiter.t.sol
+++ b/contracts/src/v0.8/ccip/test/rateLimiter/MultiAggregateRateLimiter.t.sol
@@ -7,12 +7,13 @@ import {Client} from "../../libraries/Client.sol";
 import {Internal} from "../../libraries/Internal.sol";
 import {RateLimiter} from "../../libraries/RateLimiter.sol";
 import {BaseTest} from "../BaseTest.t.sol";
+
+import {FeeQuoterSetup} from "../feeQuoter/FeeQuoterSetup.t.sol";
 import {MultiAggregateRateLimiterHelper} from "../helpers/MultiAggregateRateLimiterHelper.sol";
-import {PriceRegistrySetup} from "../priceRegistry/PriceRegistrySetup.t.sol";
 import {stdError} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
 
-contract MultiAggregateRateLimiterSetup is BaseTest, PriceRegistrySetup {
+contract MultiAggregateRateLimiterSetup is BaseTest, FeeQuoterSetup {
   MultiAggregateRateLimiterHelper internal s_rateLimiter;
 
   address internal immutable TOKEN = 0x21118E64E1fB0c487F25Dd6d3601FF6af8D32E4e;
@@ -29,12 +30,12 @@ contract MultiAggregateRateLimiterSetup is BaseTest, PriceRegistrySetup {
 
   address[] internal s_authorizedCallers;
 
-  function setUp() public virtual override(BaseTest, PriceRegistrySetup) {
+  function setUp() public virtual override(BaseTest, FeeQuoterSetup) {
     BaseTest.setUp();
-    PriceRegistrySetup.setUp();
+    FeeQuoterSetup.setUp();
 
     Internal.PriceUpdates memory priceUpdates = _getSingleTokenPriceUpdateStruct(TOKEN, TOKEN_PRICE);
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
 
     MultiAggregateRateLimiter.RateLimiterConfigArgs[] memory configUpdates =
       new MultiAggregateRateLimiter.RateLimiterConfigArgs[](4);
@@ -63,7 +64,7 @@ contract MultiAggregateRateLimiterSetup is BaseTest, PriceRegistrySetup {
     s_authorizedCallers[0] = MOCK_OFFRAMP;
     s_authorizedCallers[1] = MOCK_ONRAMP;
 
-    s_rateLimiter = new MultiAggregateRateLimiterHelper(address(s_priceRegistry), s_authorizedCallers);
+    s_rateLimiter = new MultiAggregateRateLimiterHelper(address(s_feeQuoter), s_authorizedCallers);
     s_rateLimiter.applyRateLimiterConfigUpdates(configUpdates);
   }
 
@@ -100,11 +101,9 @@ contract MultiAggregateRateLimiterSetup is BaseTest, PriceRegistrySetup {
     });
   }
 
-  function _generateAny2EVMMessageNoTokens(uint64 sourceChainSelector)
-    internal
-    pure
-    returns (Client.Any2EVMMessage memory)
-  {
+  function _generateAny2EVMMessageNoTokens(
+    uint64 sourceChainSelector
+  ) internal pure returns (Client.Any2EVMMessage memory) {
     return _generateAny2EVMMessage(sourceChainSelector, new Client.EVMTokenAmount[](0));
   }
 }
@@ -114,14 +113,14 @@ contract MultiAggregateRateLimiter_constructor is MultiAggregateRateLimiterSetup
     address[] memory authorizedCallers = new address[](0);
 
     vm.recordLogs();
-    s_rateLimiter = new MultiAggregateRateLimiterHelper(address(s_priceRegistry), authorizedCallers);
+    s_rateLimiter = new MultiAggregateRateLimiterHelper(address(s_feeQuoter), authorizedCallers);
 
-    // PriceRegistrySet
+    // FeeQuoterSet
     Vm.Log[] memory logEntries = vm.getRecordedLogs();
     assertEq(logEntries.length, 1);
 
     assertEq(OWNER, s_rateLimiter.owner());
-    assertEq(address(s_priceRegistry), s_rateLimiter.getPriceRegistry());
+    assertEq(address(s_feeQuoter), s_rateLimiter.getFeeQuoter());
   }
 
   function test_Constructor_Success() public {
@@ -130,25 +129,25 @@ contract MultiAggregateRateLimiter_constructor is MultiAggregateRateLimiterSetup
     authorizedCallers[1] = MOCK_ONRAMP;
 
     vm.expectEmit();
-    emit MultiAggregateRateLimiter.PriceRegistrySet(address(s_priceRegistry));
+    emit MultiAggregateRateLimiter.FeeQuoterSet(address(s_feeQuoter));
 
-    s_rateLimiter = new MultiAggregateRateLimiterHelper(address(s_priceRegistry), authorizedCallers);
+    s_rateLimiter = new MultiAggregateRateLimiterHelper(address(s_feeQuoter), authorizedCallers);
 
     assertEq(OWNER, s_rateLimiter.owner());
-    assertEq(address(s_priceRegistry), s_rateLimiter.getPriceRegistry());
+    assertEq(address(s_feeQuoter), s_rateLimiter.getFeeQuoter());
     assertEq(s_rateLimiter.typeAndVersion(), "MultiAggregateRateLimiter 1.6.0-dev");
   }
 }
 
-contract MultiAggregateRateLimiter_setPriceRegistry is MultiAggregateRateLimiterSetup {
+contract MultiAggregateRateLimiter_setFeeQuoter is MultiAggregateRateLimiterSetup {
   function test_Owner_Success() public {
     address newAddress = address(42);
 
     vm.expectEmit();
-    emit MultiAggregateRateLimiter.PriceRegistrySet(newAddress);
+    emit MultiAggregateRateLimiter.FeeQuoterSet(newAddress);
 
-    s_rateLimiter.setPriceRegistry(newAddress);
-    assertEq(newAddress, s_rateLimiter.getPriceRegistry());
+    s_rateLimiter.setFeeQuoter(newAddress);
+    assertEq(newAddress, s_rateLimiter.getFeeQuoter());
   }
 
   // Reverts
@@ -157,12 +156,12 @@ contract MultiAggregateRateLimiter_setPriceRegistry is MultiAggregateRateLimiter
     vm.startPrank(STRANGER);
     vm.expectRevert(bytes("Only callable by owner"));
 
-    s_rateLimiter.setPriceRegistry(STRANGER);
+    s_rateLimiter.setFeeQuoter(STRANGER);
   }
 
   function test_ZeroAddress_Revert() public {
     vm.expectRevert(AuthorizedCallers.ZeroAddressNotAllowed.selector);
-    s_rateLimiter.setPriceRegistry(address(0));
+    s_rateLimiter.setFeeQuoter(address(0));
   }
 }
 
@@ -684,7 +683,7 @@ contract MultiAggregateRateLimiter_onInboundMessage is MultiAggregateRateLimiter
 
       Internal.PriceUpdates memory priceUpdates =
         _getSingleTokenPriceUpdateStruct(s_destTokens[i], TOKEN_PRICE * (i + 1));
-      s_priceRegistry.updatePrices(priceUpdates);
+      s_feeQuoter.updatePrices(priceUpdates);
     }
     s_rateLimiter.updateRateLimitTokens(new MultiAggregateRateLimiter.LocalRateLimitToken[](0), tokensToAdd);
   }
@@ -920,7 +919,7 @@ contract MultiAggregateRateLimiter_onOutboundMessage is MultiAggregateRateLimite
 
       Internal.PriceUpdates memory priceUpdates =
         _getSingleTokenPriceUpdateStruct(s_sourceTokens[i], TOKEN_PRICE * (i + 1));
-      s_priceRegistry.updatePrices(priceUpdates);
+      s_feeQuoter.updatePrices(priceUpdates);
     }
     s_rateLimiter.updateRateLimitTokens(new MultiAggregateRateLimiter.LocalRateLimitToken[](0), tokensToAdd);
   }
@@ -1179,11 +1178,9 @@ contract MultiAggregateRateLimiter_onOutboundMessage is MultiAggregateRateLimite
     s_rateLimiter.onOutboundMessage(CHAIN_SELECTOR_1, _generateEVM2AnyMessageNoTokens());
   }
 
-  function _generateEVM2AnyMessage(Client.EVMTokenAmount[] memory tokenAmounts)
-    public
-    view
-    returns (Client.EVM2AnyMessage memory)
-  {
+  function _generateEVM2AnyMessage(
+    Client.EVMTokenAmount[] memory tokenAmounts
+  ) public view returns (Client.EVM2AnyMessage memory) {
     return Client.EVM2AnyMessage({
       receiver: abi.encode(OWNER),
       data: "",
diff --git a/contracts/src/v0.8/ccip/test/router/Router.t.sol b/contracts/src/v0.8/ccip/test/router/Router.t.sol
index 5f3a3a66ab..95d3c2f293 100644
--- a/contracts/src/v0.8/ccip/test/router/Router.t.sol
+++ b/contracts/src/v0.8/ccip/test/router/Router.t.sol
@@ -210,7 +210,7 @@ contract Router_ccipSend is EVM2EVMOnRampSetup {
 
     address[] memory feeTokens = new address[](1);
     feeTokens[0] = s_sourceTokens[1];
-    s_priceRegistry.applyFeeTokensUpdates(feeTokens, new address[](0));
+    s_feeQuoter.applyFeeTokensUpdates(feeTokens, new address[](0));
 
     Client.EVM2AnyMessage memory message = _generateEmptyMessage();
     message.feeToken = s_sourceTokens[1];
@@ -262,7 +262,7 @@ contract Router_ccipSend is EVM2EVMOnRampSetup {
     // Set the new token as feeToken
     address[] memory feeTokens = new address[](1);
     feeTokens[0] = feeTokenWithZeroFeeAndGas;
-    s_priceRegistry.applyFeeTokensUpdates(feeTokens, new address[](0));
+    s_feeQuoter.applyFeeTokensUpdates(feeTokens, new address[](0));
 
     // Update the price of the newly set feeToken
     Internal.PriceUpdates memory priceUpdates = _getSingleTokenPriceUpdateStruct(feeTokenWithZeroFeeAndGas, 2_000 ether);
@@ -270,7 +270,7 @@ contract Router_ccipSend is EVM2EVMOnRampSetup {
     priceUpdates.gasPriceUpdates[0] =
       Internal.GasPriceUpdate({destChainSelector: DEST_CHAIN_SELECTOR, usdPerUnitGas: 0});
 
-    s_priceRegistry.updatePrices(priceUpdates);
+    s_feeQuoter.updatePrices(priceUpdates);
 
     // Set the feeToken args on the onRamp
     EVM2EVMOnRamp.FeeTokenConfigArgs[] memory feeTokenConfigArgs = new EVM2EVMOnRamp.FeeTokenConfigArgs[](1);
diff --git a/contracts/src/v0.8/l2ep/test/v1_0_0/arbitrum/ArbitrumSequencerUptimeFeed.t.sol b/contracts/src/v0.8/l2ep/test/v1_0_0/arbitrum/ArbitrumSequencerUptimeFeed.t.sol
index 3b9df3bf91..5565409709 100644
--- a/contracts/src/v0.8/l2ep/test/v1_0_0/arbitrum/ArbitrumSequencerUptimeFeed.t.sol
+++ b/contracts/src/v0.8/l2ep/test/v1_0_0/arbitrum/ArbitrumSequencerUptimeFeed.t.sol
@@ -246,199 +246,3 @@ contract ArbitrumSequencerUptimeFeed_ProtectReadsOnAggregatorV2V3InterfaceFuncti
     assertEq(answer, 0);
   }
 }
-
-contract ArbitrumSequencerUptimeFeed_GasCosts is ArbitrumSequencerUptimeFeedTest {
-  /// @notice it should consume a known amount of gas for updates
-  function test_GasCosts() public {
-    // Sets msg.sender and tx.origin to a valid address
-    vm.startPrank(s_l2MessengerAddr, s_l2MessengerAddr);
-
-    // Assert initial conditions
-    uint256 timestamp = s_arbitrumSequencerUptimeFeed.latestTimestamp();
-    assertEq(s_arbitrumSequencerUptimeFeed.latestAnswer(), 0);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed;
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // measures gas used for no update
-    expectedGasUsed = 5507; // NOTE: used to be 28300 in hardhat tests
-    gasStart = gasleft();
-    s_arbitrumSequencerUptimeFeed.updateStatus(false, uint64(timestamp + 1000));
-    gasFinal = gasleft();
-    assertEq(s_arbitrumSequencerUptimeFeed.latestAnswer(), 0);
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-
-    // measures gas used for update
-    expectedGasUsed = 68198; // NOTE: used to be 93015 in hardhat tests
-    gasStart = gasleft();
-    s_arbitrumSequencerUptimeFeed.updateStatus(true, uint64(timestamp + 1000));
-    gasFinal = gasleft();
-    assertEq(s_arbitrumSequencerUptimeFeed.latestAnswer(), 1);
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-}
-
-contract ArbitrumSequencerUptimeFeed_AggregatorInterfaceGasCosts is ArbitrumSequencerUptimeFeedTest {
-  /// @notice it should consume a known amount of gas for getRoundData(uint80)
-  function test_GasUsageForGetRoundData() public {
-    // Sets msg.sender and tx.origin to a valid address
-    vm.startPrank(s_l2MessengerAddr, s_l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 4658; // NOTE: used to be 31157 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_arbitrumSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_arbitrumSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_arbitrumSequencerUptimeFeed.getRoundData(1);
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestRoundData()
-  function test_GasUsageForLatestRoundData() public {
-    // Sets msg.sender and tx.origin to a valid address
-    vm.startPrank(s_l2MessengerAddr, s_l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 2154; // NOTE: used to be 28523 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_arbitrumSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_arbitrumSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_arbitrumSequencerUptimeFeed.latestRoundData();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestAnswer()
-  function test_GasUsageForLatestAnswer() public {
-    // Sets msg.sender and tx.origin to a valid address
-    vm.startPrank(s_l2MessengerAddr, s_l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 1722; // NOTE: used to be 28329 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_arbitrumSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_arbitrumSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_arbitrumSequencerUptimeFeed.latestAnswer();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestTimestamp()
-  function test_GasUsageForLatestTimestamp() public {
-    // Sets msg.sender and tx.origin to a valid address
-    vm.startPrank(s_l2MessengerAddr, s_l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 1652; // NOTE: used to be 28229 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_arbitrumSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_arbitrumSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_arbitrumSequencerUptimeFeed.latestTimestamp();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestRound()
-  function test_GasUsageForLatestRound() public {
-    // Sets msg.sender and tx.origin to a valid address
-    vm.startPrank(s_l2MessengerAddr, s_l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 1632; // NOTE: used to be 28245 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_arbitrumSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_arbitrumSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_arbitrumSequencerUptimeFeed.latestRound();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for getAnswer()
-  function test_GasUsageForGetAnswer() public {
-    // Sets msg.sender and tx.origin to a valid address
-    vm.startPrank(s_l2MessengerAddr, s_l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 4059; // NOTE: used to be 30799 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_arbitrumSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_arbitrumSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_arbitrumSequencerUptimeFeed.getAnswer(1);
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for getTimestamp()
-  function test_GasUsageForGetTimestamp() public {
-    // Sets msg.sender and tx.origin to a valid address
-    vm.startPrank(s_l2MessengerAddr, s_l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 4024; // NOTE: used to be 30753 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_arbitrumSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_arbitrumSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_arbitrumSequencerUptimeFeed.getTimestamp(1);
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-}
diff --git a/contracts/src/v0.8/l2ep/test/v1_0_0/optimism/OptimismSequencerUptimeFeed.t.sol b/contracts/src/v0.8/l2ep/test/v1_0_0/optimism/OptimismSequencerUptimeFeed.t.sol
index 60598b9f95..071d6e5b42 100644
--- a/contracts/src/v0.8/l2ep/test/v1_0_0/optimism/OptimismSequencerUptimeFeed.t.sol
+++ b/contracts/src/v0.8/l2ep/test/v1_0_0/optimism/OptimismSequencerUptimeFeed.t.sol
@@ -318,207 +318,3 @@ contract OptimismSequencerUptimeFeed_ProtectReadsOnAggregatorV2V3InterfaceFuncti
     assertEq(answer, 0);
   }
 }
-
-contract OptimismSequencerUptimeFeed_GasCosts is OptimismSequencerUptimeFeedTest {
-  /// @notice it should consume a known amount of gas for updates
-  function test_GasCosts() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockOptimismL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Assert initial conditions
-    uint256 timestamp = s_optimismSequencerUptimeFeed.latestTimestamp();
-    assertEq(s_optimismSequencerUptimeFeed.latestAnswer(), 0);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed;
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // measures gas used for no update
-    expectedGasUsed = 10197; // NOTE: used to be 38594 in hardhat tests
-    gasStart = gasleft();
-    s_optimismSequencerUptimeFeed.updateStatus(false, uint64(timestamp + 1000));
-    gasFinal = gasleft();
-    assertEq(s_optimismSequencerUptimeFeed.latestAnswer(), 0);
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-
-    // measures gas used for update
-    expectedGasUsed = 33348; // NOTE: used to be 60170 in hardhat tests
-    gasStart = gasleft();
-    s_optimismSequencerUptimeFeed.updateStatus(true, uint64(timestamp + 1000));
-    gasFinal = gasleft();
-    assertEq(s_optimismSequencerUptimeFeed.latestAnswer(), 1);
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-}
-
-contract OptimismSequencerUptimeFeed_AggregatorInterfaceGasCosts is OptimismSequencerUptimeFeedTest {
-  /// @notice it should consume a known amount of gas for getRoundData(uint80)
-  function test_GasUsageForGetRoundData() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockOptimismL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 4504; // NOTE: used to be 30952 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_optimismSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_optimismSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_optimismSequencerUptimeFeed.getRoundData(1);
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestRoundData()
-  function test_GasUsageForLatestRoundData() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockOptimismL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 2154; // NOTE: used to be 28523 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_optimismSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_optimismSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_optimismSequencerUptimeFeed.latestRoundData();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestAnswer()
-  function test_GasUsageForLatestAnswer() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockOptimismL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 1722; // NOTE: used to be 28329 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_optimismSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_optimismSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_optimismSequencerUptimeFeed.latestAnswer();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestTimestamp()
-  function test_GasUsageForLatestTimestamp() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockOptimismL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 1598; // NOTE: used to be 28229 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_optimismSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_optimismSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_optimismSequencerUptimeFeed.latestTimestamp();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestRound()
-  function test_GasUsageForLatestRound() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockOptimismL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 1632; // NOTE: used to be 28245 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_optimismSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_optimismSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_optimismSequencerUptimeFeed.latestRound();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for getAnswer()
-  function test_GasUsageForGetAnswer() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockOptimismL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 3929; // NOTE: used to be 30682 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_optimismSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_optimismSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_optimismSequencerUptimeFeed.getAnswer(1);
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for getTimestamp()
-  function test_GasUsageForGetTimestamp() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockOptimismL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 3817; // NOTE: used to be 30570 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_optimismSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_optimismSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_optimismSequencerUptimeFeed.getTimestamp(1);
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-}
diff --git a/contracts/src/v0.8/l2ep/test/v1_0_0/scroll/ScrollSequencerUptimeFeed.t.sol b/contracts/src/v0.8/l2ep/test/v1_0_0/scroll/ScrollSequencerUptimeFeed.t.sol
index 520fbf6dfd..3aac50e7c1 100644
--- a/contracts/src/v0.8/l2ep/test/v1_0_0/scroll/ScrollSequencerUptimeFeed.t.sol
+++ b/contracts/src/v0.8/l2ep/test/v1_0_0/scroll/ScrollSequencerUptimeFeed.t.sol
@@ -322,207 +322,3 @@ contract ScrollSequencerUptimeFeed_ProtectReadsOnAggregatorV2V3InterfaceFunction
     assertEq(answer, 0);
   }
 }
-
-contract ScrollSequencerUptimeFeed_GasCosts is ScrollSequencerUptimeFeedTest {
-  /// @notice it should consume a known amount of gas for updates
-  function test_GasCosts() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockScrollL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Assert initial conditions
-    uint256 timestamp = s_scrollSequencerUptimeFeed.latestTimestamp();
-    assertEq(s_scrollSequencerUptimeFeed.latestAnswer(), 0);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed;
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // measures gas used for no update
-    expectedGasUsed = 10197; // NOTE: used to be 38594 in hardhat tests
-    gasStart = gasleft();
-    s_scrollSequencerUptimeFeed.updateStatus(false, uint64(timestamp + 1000));
-    gasFinal = gasleft();
-    assertEq(s_scrollSequencerUptimeFeed.latestAnswer(), 0);
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-
-    // measures gas used for update
-    expectedGasUsed = 31644; // NOTE: used to be 58458 in hardhat tests
-    gasStart = gasleft();
-    s_scrollSequencerUptimeFeed.updateStatus(true, uint64(timestamp + 1000));
-    gasFinal = gasleft();
-    assertEq(s_scrollSequencerUptimeFeed.latestAnswer(), 1);
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-}
-
-contract ScrollSequencerUptimeFeed_AggregatorInterfaceGasCosts is ScrollSequencerUptimeFeedTest {
-  /// @notice it should consume a known amount of gas for getRoundData(uint80)
-  function test_GasUsageForGetRoundData() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockScrollL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 4504; // NOTE: used to be 30952 in hardhat tesst
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_scrollSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_scrollSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_scrollSequencerUptimeFeed.getRoundData(1);
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestRoundData()
-  function test_GasUsageForLatestRoundData() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockScrollL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 2154; // NOTE: used to be 28523 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_scrollSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_scrollSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_scrollSequencerUptimeFeed.latestRoundData();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestAnswer()
-  function test_GasUsageForLatestAnswer() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockScrollL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 1566; // NOTE: used to be 28229 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_scrollSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_scrollSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_scrollSequencerUptimeFeed.latestAnswer();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestTimestamp()
-  function test_GasUsageForLatestTimestamp() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockScrollL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 1459; // NOTE: used to be 28129 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_scrollSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_scrollSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_scrollSequencerUptimeFeed.latestTimestamp();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for latestRound()
-  function test_GasUsageForLatestRound() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockScrollL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 1470; // NOTE: used to be 28145 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_scrollSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_scrollSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_scrollSequencerUptimeFeed.latestRound();
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for getAnswer()
-  function test_GasUsageForGetAnswer() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockScrollL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 3929; // NOTE: used to be 30682 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_scrollSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_scrollSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_scrollSequencerUptimeFeed.getAnswer(1);
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-
-  /// @notice it should consume a known amount of gas for getTimestamp()
-  function test_GasUsageForGetTimestamp() public {
-    // Sets msg.sender and tx.origin to a valid address
-    address l2MessengerAddr = address(s_mockScrollL2CrossDomainMessenger);
-    vm.startPrank(l2MessengerAddr, l2MessengerAddr);
-
-    // Defines helper variables for measuring gas usage
-    uint256 expectedGasUsed = 3817; // NOTE: used to be 30570 in hardhat tests
-    uint256 gasStart;
-    uint256 gasFinal;
-
-    // Initializes a round
-    uint256 timestamp = s_scrollSequencerUptimeFeed.latestTimestamp() + 1000;
-    s_scrollSequencerUptimeFeed.updateStatus(true, uint64(timestamp));
-
-    // Measures gas usage
-    gasStart = gasleft();
-    s_scrollSequencerUptimeFeed.getTimestamp(1);
-    gasFinal = gasleft();
-
-    // Checks that gas usage is within expected range
-    assertGasUsageIsCloseTo(expectedGasUsed, gasStart, gasFinal, GAS_USED_DEVIATION);
-  }
-}
diff --git a/contracts/src/v0.8/llo-feeds/test/ByteUtilTest.t.sol b/contracts/src/v0.8/llo-feeds/test/ByteUtilTest.t.sol
index 21bd957e4e..fdabaaf3d9 100644
--- a/contracts/src/v0.8/llo-feeds/test/ByteUtilTest.t.sol
+++ b/contracts/src/v0.8/llo-feeds/test/ByteUtilTest.t.sol
@@ -15,7 +15,7 @@ contract ByteUtilTest is Test {
 
   bytes4 internal constant MALFORMED_ERROR_SELECTOR = bytes4(keccak256("MalformedData()"));
 
-  function test_readUint256Max() public {
+  function test_readUint256Max() public pure {
     //read the first 32 bytes
     uint256 result = B_512._readUint256(0);
 
@@ -23,7 +23,7 @@ contract ByteUtilTest is Test {
     assertEq(result, type(uint256).max);
   }
 
-  function test_readUint192Max() public {
+  function test_readUint192Max() public pure {
     //read the first 24 bytes
     uint256 result = B_512._readUint192(0);
 
@@ -31,7 +31,7 @@ contract ByteUtilTest is Test {
     assertEq(result, type(uint192).max);
   }
 
-  function test_readUint32Max() public {
+  function test_readUint32Max() public pure {
     //read the first 4 bytes
     uint256 result = B_512._readUint32(0);
 
@@ -39,7 +39,7 @@ contract ByteUtilTest is Test {
     assertEq(result, type(uint32).max);
   }
 
-  function test_readUint256Min() public {
+  function test_readUint256Min() public pure {
     //read the second 32 bytes
     uint256 result = B_512._readUint256(32);
 
@@ -47,7 +47,7 @@ contract ByteUtilTest is Test {
     assertEq(result, type(uint256).min);
   }
 
-  function test_readUint192Min() public {
+  function test_readUint192Min() public pure {
     //read the second 24 bytes
     uint256 result = B_512._readUint192(32);
 
@@ -55,7 +55,7 @@ contract ByteUtilTest is Test {
     assertEq(result, type(uint192).min);
   }
 
-  function test_readUint32Min() public {
+  function test_readUint32Min() public pure {
     //read the second 4 bytes
     uint256 result = B_512._readUint32(32);
 
@@ -63,7 +63,7 @@ contract ByteUtilTest is Test {
     assertEq(result, type(uint32).min);
   }
 
-  function test_readUint256MultiWord() public {
+  function test_readUint256MultiWord() public pure {
     //read the first 32 bytes
     uint256 result = B_512._readUint256(31);
 
@@ -71,7 +71,7 @@ contract ByteUtilTest is Test {
     assertEq(result, type(uint256).max << 248);
   }
 
-  function test_readUint192MultiWord() public {
+  function test_readUint192MultiWord() public pure {
     //read the first 24 bytes
     uint256 result = B_512._readUint192(31);
 
@@ -79,7 +79,7 @@ contract ByteUtilTest is Test {
     assertEq(result, type(uint192).max << 184);
   }
 
-  function test_readUint32MultiWord() public {
+  function test_readUint32MultiWord() public pure {
     //read the first 4 bytes
     uint256 result = B_512._readUint32(31);
 
@@ -135,7 +135,7 @@ contract ByteUtilTest is Test {
     B_EMPTY._readUint32(0);
   }
 
-  function test_readAddress() public {
+  function test_readAddress() public pure {
     //read the first 20 bytes
     address result = B_512._readAddress(0);
 
@@ -143,7 +143,7 @@ contract ByteUtilTest is Test {
     assertEq(result, address(type(uint160).max));
   }
 
-  function test_readZeroAddress() public {
+  function test_readZeroAddress() public pure {
     //read the first 32 bytes after the first word
     address result = B_512._readAddress(32);
 
@@ -151,7 +151,7 @@ contract ByteUtilTest is Test {
     assertEq(result, address(type(uint160).min));
   }
 
-  function test_readAddressMultiWord() public {
+  function test_readAddressMultiWord() public pure {
     //read the first 20 bytes after byte 13
     address result = B_512._readAddress(13);
 
diff --git a/contracts/src/v0.8/operatorforwarder/test/testhelpers/MaliciousConsumer.sol b/contracts/src/v0.8/operatorforwarder/test/testhelpers/MaliciousConsumer.sol
index 842eec9054..bd731c7718 100644
--- a/contracts/src/v0.8/operatorforwarder/test/testhelpers/MaliciousConsumer.sol
+++ b/contracts/src/v0.8/operatorforwarder/test/testhelpers/MaliciousConsumer.sol
@@ -7,7 +7,7 @@ contract MaliciousConsumer is Chainlinked {
   uint256 private constant ORACLE_PAYMENT = 1 ether;
   uint256 private s_expiration;
 
-  constructor(address _link, address _oracle) public payable {
+  constructor(address _link, address _oracle) payable {
     setLinkToken(_link);
     setOracle(_oracle);
   }
diff --git a/contracts/src/v0.8/operatorforwarder/test/testhelpers/MaliciousMultiWordConsumer.sol b/contracts/src/v0.8/operatorforwarder/test/testhelpers/MaliciousMultiWordConsumer.sol
index 6e5881524f..93af16f64f 100644
--- a/contracts/src/v0.8/operatorforwarder/test/testhelpers/MaliciousMultiWordConsumer.sol
+++ b/contracts/src/v0.8/operatorforwarder/test/testhelpers/MaliciousMultiWordConsumer.sol
@@ -8,7 +8,7 @@ contract MaliciousMultiWordConsumer is ChainlinkClient {
   uint256 private constant ORACLE_PAYMENT = 1 ether;
   uint256 private s_expiration;
 
-  constructor(address _link, address _oracle) public payable {
+  constructor(address _link, address _oracle) payable {
     _setChainlinkToken(_link);
     _setChainlinkOracle(_oracle);
   }
diff --git a/contracts/src/v0.8/shared/test/call/CallWithExactGas.t.sol b/contracts/src/v0.8/shared/test/call/CallWithExactGas.t.sol
index 444112d2d8..3623cb8b12 100644
--- a/contracts/src/v0.8/shared/test/call/CallWithExactGas.t.sol
+++ b/contracts/src/v0.8/shared/test/call/CallWithExactGas.t.sol
@@ -220,7 +220,7 @@ contract CallWithExactGas__callWithExactGasSafeReturnData is CallWithExactGasSet
     assertGt(gasUsed, 500);
   }
 
-  function testFuzz_CallWithExactGasSafeReturnData_ConsumeAllGas_Success(uint8 gasLimitMultiplier) external {
+  function test_Fuzz_CallWithExactGasSafeReturnData_ConsumeAllGas_Success(uint8 gasLimitMultiplier) external {
     vm.assume(gasLimitMultiplier > 0); // Assume not zero to avoid zero gas being passed to s_gasConsumer
     uint16 maxRetBytes = 0;
 
@@ -244,7 +244,7 @@ contract CallWithExactGas__callWithExactGasSafeReturnData is CallWithExactGasSet
 
     assertTrue(success, "Error: External Call Failed");
 
-    //Assert equal within a margin of error of 1/64 of the gas limit to account for excess gas used by execution library
+    // Assert equal within a margin of error of 1/64 of the gas limit to account for excess gas used by execution library
     assertApproxEqAbs(
       gasUsed - CALL_WITH_EXACT_GAS_SAFE_RETURN_DATA_GAS_OVERHEAD,
       gasLimit,
diff --git a/contracts/src/v0.8/shared/test/testhelpers/GasConsumer.sol b/contracts/src/v0.8/shared/test/testhelpers/GasConsumer.sol
index 3c7bd2d596..efac2d15c1 100644
--- a/contracts/src/v0.8/shared/test/testhelpers/GasConsumer.sol
+++ b/contracts/src/v0.8/shared/test/testhelpers/GasConsumer.sol
@@ -9,8 +9,9 @@ contract GasConsumer {
       } lt(0, 1) {
 
       } {
-        // If 60 gas is remaining, then exit the loop by returning. 60 was determined by manual binary search to be the minimal amount of gas needed but less than the cost of another loop
-        if lt(gas(), 60) {
+        // If 100 gas is remaining, then exit the loop by returning. 100 was determined by manual binary search to be
+        // the minimal amount of gas needed but less than the cost of another loop
+        if lt(gas(), 100) {
           return(0x0, 0x0) // Return with no return data
         }
       }
diff --git a/contracts/src/v0.8/shared/test/token/ERC677/BurnMintERC677.t.sol b/contracts/src/v0.8/shared/test/token/ERC677/BurnMintERC677.t.sol
index de9067a569..2815f99256 100644
--- a/contracts/src/v0.8/shared/test/token/ERC677/BurnMintERC677.t.sol
+++ b/contracts/src/v0.8/shared/test/token/ERC677/BurnMintERC677.t.sol
@@ -338,7 +338,7 @@ contract BurnMintERC677_increaseApproval is BurnMintERC677Setup {
 }
 
 contract BurnMintERC677_supportsInterface is BurnMintERC677Setup {
-  function testConstructorSuccess() public {
+  function testConstructorSuccess() public view {
     assertTrue(s_burnMintERC677.supportsInterface(type(IERC20).interfaceId));
     assertTrue(s_burnMintERC677.supportsInterface(type(IERC677).interfaceId));
     assertTrue(s_burnMintERC677.supportsInterface(type(IBurnMintERC20).interfaceId));
diff --git a/contracts/src/v0.8/shared/test/token/ERC677/OpStackBurnMintERC677.t.sol b/contracts/src/v0.8/shared/test/token/ERC677/OpStackBurnMintERC677.t.sol
index 7987fefec4..614b3bea15 100644
--- a/contracts/src/v0.8/shared/test/token/ERC677/OpStackBurnMintERC677.t.sol
+++ b/contracts/src/v0.8/shared/test/token/ERC677/OpStackBurnMintERC677.t.sol
@@ -41,7 +41,7 @@ contract OpStackBurnMintERC677_constructor is OpStackBurnMintERC677Setup {
 }
 
 contract OpStackBurnMintERC677_supportsInterface is OpStackBurnMintERC677Setup {
-  function testConstructorSuccess() public {
+  function testConstructorSuccess() public view {
     assertTrue(s_opStackBurnMintERC677.supportsInterface(type(IOptimismMintableERC20Minimal).interfaceId));
     assertTrue(s_opStackBurnMintERC677.supportsInterface(type(IERC677).interfaceId));
     assertTrue(s_opStackBurnMintERC677.supportsInterface(type(IBurnMintERC20).interfaceId));
diff --git a/contracts/src/v0.8/shared/test/util/SortedSetValidationUtil.t.sol b/contracts/src/v0.8/shared/test/util/SortedSetValidationUtil.t.sol
index ae7eba479f..bf88df64ad 100644
--- a/contracts/src/v0.8/shared/test/util/SortedSetValidationUtil.t.sol
+++ b/contracts/src/v0.8/shared/test/util/SortedSetValidationUtil.t.sol
@@ -50,7 +50,7 @@ contract SortedSetValidationUtilBaseTest is BaseTest {
 contract SortedSetValidationUtil_CheckIsValidUniqueSubsetTest is SortedSetValidationUtilBaseTest {
   // Successes.
 
-  function test__checkIsValidUniqueSubset_ValidSubset_Success() public {
+  function test__checkIsValidUniqueSubset_ValidSubset_Success() public pure {
     (bytes32[] memory subset, bytes32[] memory superset) = _createSets(3, 5);
     _convertArrayToSortedSet(superset, OFFSET);
     _convertArrayToSubset(subset, superset);
@@ -123,7 +123,7 @@ contract SortedSetValidationUtil_CheckIsValidUniqueSubsetTest is SortedSetValida
     SortedSetValidationUtil._checkIsValidUniqueSubset(subset, superset);
   }
 
-  function test__checkIsValidUniqueSubset_SubsetEqualsSuperset_NoRevert() public {
+  function test__checkIsValidUniqueSubset_SubsetEqualsSuperset_NoRevert() public pure {
     (bytes32[] memory subset, bytes32[] memory superset) = _createSets(5, 5);
     _convertArrayToSortedSet(subset, OFFSET);
     _convertArrayToSortedSet(superset, OFFSET);
@@ -131,7 +131,7 @@ contract SortedSetValidationUtil_CheckIsValidUniqueSubsetTest is SortedSetValida
     SortedSetValidationUtil._checkIsValidUniqueSubset(subset, superset);
   }
 
-  function test__checkIsValidUniqueSubset_SingleElementSubset() public {
+  function test__checkIsValidUniqueSubset_SingleElementSubset() public pure {
     (bytes32[] memory subset, bytes32[] memory superset) = _createSets(1, 5);
     _convertArrayToSortedSet(superset, OFFSET);
     _convertArrayToSubset(subset, superset);
@@ -139,7 +139,7 @@ contract SortedSetValidationUtil_CheckIsValidUniqueSubsetTest is SortedSetValida
     SortedSetValidationUtil._checkIsValidUniqueSubset(subset, superset);
   }
 
-  function test__checkIsValidUniqueSubset_SingleElementSubsetAndSuperset_Equal() public {
+  function test__checkIsValidUniqueSubset_SingleElementSubsetAndSuperset_Equal() public pure {
     (bytes32[] memory subset, bytes32[] memory superset) = _createSets(1, 1);
     _convertArrayToSortedSet(subset, OFFSET);
     _convertArrayToSortedSet(superset, OFFSET);
diff --git a/contracts/src/v0.8/vrf/test/BatchVRFCoordinatorV2Plus.t.sol b/contracts/src/v0.8/vrf/test/BatchVRFCoordinatorV2Plus.t.sol
index c2938cb35b..4197073aa5 100644
--- a/contracts/src/v0.8/vrf/test/BatchVRFCoordinatorV2Plus.t.sol
+++ b/contracts/src/v0.8/vrf/test/BatchVRFCoordinatorV2Plus.t.sol
@@ -48,17 +48,26 @@ contract BatchVRFCoordinatorV2PlusTest is FixtureVRFCoordinatorV2_5 {
     // Store the previous block's blockhash.
     vm.roll(requestBlock + 1);
     s_bhs.store(requestBlock);
+    assertEq(hex"1a192fabce13988b84994d4296e6cdc418d55e2f1d7f942188d4040b94fc57ac", s_bhs.getBlockhash(requestBlock));
 
     VRFTypes.Proof[] memory proofs = new VRFTypes.Proof[](2);
     VRFTypes.RequestCommitmentV2Plus[] memory rcs = new VRFTypes.RequestCommitmentV2Plus[](2);
 
-    // Proof generated via the generate-proof-v2-plus script command. Example usage:
-    // _printGenerateProofV2PlusCommand(address(s_consumer), 1, requestBlock, true);
+    // Proof generated via the generate-proof-v2-plus script command.
+    // 1st step: Uncomment the print command below and run the test to print the output.
+    // _printGenerateProofV2PlusCommand(address(s_consumer1), 1, requestBlock, false);
+    // 2nd step: export the following environment variables to run the generate-proof-v2-plus script.
+    // export ETH_URL=https://ethereum-sepolia-rpc.publicnode.com # or any other RPC provider you prefer
+    // export ETH_CHAIN_ID=11155111 # or switch to any other chain
+    // export ACCOUNT_KEY=<your test EOA private key>
+    // 3rd step: copy the output from the 1st step and update the command below, then run the command
+    // and copy the command output in the proof section below
     /*
+       Run from this folder: chainlink/core/scripts/vrfv2plus/testnet
        go run . generate-proof-v2-plus \
          -key-hash 0x9f2353bde94264dbc3d554a94cceba2d7d2b4fdce4304d3e09a1fea9fbeb1528 \
-         -pre-seed 33855227690351884611579800220581891477580182035146587491531555927634180294480 \
-         -block-hash 0x0a \
+         -pre-seed 4430852740828987645228960511496023658059009607317025880962658187812299131155 \
+         -block-hash 0x1a192fabce13988b84994d4296e6cdc418d55e2f1d7f942188d4040b94fc57ac \
          -block-num 10 \
          -sender 0xdc90e8ce61c1af8a638b95264037c8e67ee5765c \
          -native-payment true
@@ -70,22 +79,22 @@ contract BatchVRFCoordinatorV2PlusTest is FixtureVRFCoordinatorV2_5 {
         62070622898698443831883535403436258712770888294397026493185421712108624767191
       ],
       gamma: [
-        80420391742429647505172101941811820476888293644816377569181566466584288434705,
-        24046736031266889997051641830469514057863365715722268340801477580836256044582
+        26762213923453052192184693334574145607290366984305044804336172347176490943606,
+        70503534560525619072578237689732581746976650376431765635714023643649039207077
       ],
-      c: 74775128390693502914275156263410881155583102046081919417827483535122161050585,
-      s: 69563235412360165148368009853509434870917653835330501139204071967997764190111,
-      seed: 33855227690351884611579800220581891477580182035146587491531555927634180294480,
-      uWitness: 0xfB0663eaf48785540dE0FD0F837FD9c09BF4B80A,
+      c: 10992233996918874905152274435276937088064589467016709044984819613170049539489,
+      s: 79662863379962724455809192044326025082567113176696761949197261107120333769102,
+      seed: 4430852740828987645228960511496023658059009607317025880962658187812299131155,
+      uWitness: 0x421A52Fb797d76Fb610aA1a0c020346fC1Ee2DeB,
       cGammaWitness: [
-        53711159452748734758194447734939737695995909567499536035707522847057731697403,
-        113650002631484103366420937668971311744887820666944514581352028601506700116835
+        50748523246052507241857300891945475679319243536065937584940024494820365165901,
+        85746856994474260612851047426766648416105284284185975301552792881940939754570
       ],
       sHashWitness: [
-        89656531714223714144489731263049239277719465105516547297952288438117443488525,
-        90859682705760125677895017864538514058733199985667976488434404721197234427011
+        78637275871978664522379716948105702461748200460627087255706483027519919611423,
+        82219236913923465822780520561305604064850823877720616893986252854976640396959
       ],
-      zInv: 97275608653505690744303242942631893944856831559408852202478373762878300587548
+      zInv: 60547558497534848069125896511700272238016171243048151035528198622956754542730
     });
     rcs[0] = VRFTypes.RequestCommitmentV2Plus({
       blockNum: requestBlock,
@@ -116,14 +125,23 @@ contract BatchVRFCoordinatorV2PlusTest is FixtureVRFCoordinatorV2_5 {
     // Store the previous block's blockhash.
     vm.roll(requestBlock + 1);
     s_bhs.store(requestBlock);
+    assertEq(hex"731dc163f73d31d8c68f9917ce4ff967753939f70432973c04fd2c2a48148607", s_bhs.getBlockhash(requestBlock));
 
-    // Proof generated via the generate-proof-v2-plus script command. Example usage:
+    // Proof generated via the generate-proof-v2-plus script command.
+    // 1st step: Uncomment the print command below and run the test to print the output.
     // _printGenerateProofV2PlusCommand(address(s_consumer1), 1, requestBlock, false);
+    // 2nd step: export the following environment variables to run the generate-proof-v2-plus script.
+    // export ETH_URL=https://ethereum-sepolia-rpc.publicnode.com # or any other RPC provider you prefer
+    // export ETH_CHAIN_ID=11155111 # or switch to any other chain
+    // export ACCOUNT_KEY=<your test EOA private key>
+    // 3rd step: copy the output from the 1st step and update the command below, then run the command
+    // and copy the command output in the proof section below
     /*
+       Run from this folder: chainlink/core/scripts/vrfv2plus/testnet
        go run . generate-proof-v2-plus \
          -key-hash 0x9f2353bde94264dbc3d554a94cceba2d7d2b4fdce4304d3e09a1fea9fbeb1528 \
-         -pre-seed 76568185840201037774581758921393822690942290841865097674309745036496166431060 \
-         -block-hash 0x14 \
+         -pre-seed 14541556911652758131165474365357244907354309169650401973525070879190071151266 \
+         -block-hash 0x731dc163f73d31d8c68f9917ce4ff967753939f70432973c04fd2c2a48148607 \
          -block-num 20 \
          -sender 0x2f1c0761d6e4b1e5f01968d6c746f695e5f3e25d \
          -native-payment false
@@ -134,22 +152,22 @@ contract BatchVRFCoordinatorV2PlusTest is FixtureVRFCoordinatorV2_5 {
         62070622898698443831883535403436258712770888294397026493185421712108624767191
       ],
       gamma: [
-        21323932463597506192387578758854201988004673105893105492473194972397109828006,
-        96834737826889397196571646974355352644437196500310392203712129010026003355112
+        97658842840420719674383370910135023062422561858595941631054490821636116883585,
+        44255438468488339528368406358785988551798314198954634050943346751039644360856
       ],
-      c: 8775807990949224376582975115621037245862755412370175152581490650310350359728,
-      s: 6805708577951013810918872616271445638109899206333819877111740872779453350091,
-      seed: 76568185840201037774581758921393822690942290841865097674309745036496166431060,
-      uWitness: 0xE82fF24Fecfbe73d682f38308bE3E039Dfabdf5c,
+      c: 5233652943248967403606766735502925802264855214922758107203237169366748118852,
+      s: 87931642435666855739510477620068257005869145374865238974094299759068218698655,
+      seed: 14541556911652758131165474365357244907354309169650401973525070879190071151266,
+      uWitness: 0x0A87a9CB71983cE0F2C4bA41D0c1A6Fb1785c46A,
       cGammaWitness: [
-        92810770919624535241476539842820168209710445519252592382122118536598338376923,
-        17271305664006119131434661141858450289379246199095231636439133258170648418554
+        54062743217909816783918413821204010151082432359411822104552882037459289383418,
+        67491004534731980264926765871774299056809003077448271411776926359153820235981
       ],
       sHashWitness: [
-        29540023305939374439696120003978246982707698669656874393367212257432197207536,
-        93902323936532381028323379401739289810874348405259732508442252936582467730050
+        7745933951617569731026754652291310837540252155195826133994719499558406927394,
+        58405861596456412358325504621101233475720292237067230796670629212111423924259
       ],
-      zInv: 88845170436601946907659333156418518556235340365885668267853966404617557948692
+      zInv: 44253513765558903217330502897662324213800000485156126961643960636269885275795
     });
     rcs[1] = VRFTypes.RequestCommitmentV2Plus({
       blockNum: requestBlock,
@@ -168,9 +186,9 @@ contract BatchVRFCoordinatorV2PlusTest is FixtureVRFCoordinatorV2_5 {
     // The payments are NOT pre-calculated and simply copied from the actual event.
     // We can assert and ignore the payment field but the code will be considerably longer.
     vm.expectEmit(true, true, false, true, address(s_coordinator));
-    emit RandomWordsFulfilled(output.requestId, output.randomness, s_subId, 500000000000143283, true, true, false);
+    emit RandomWordsFulfilled(output.requestId, output.randomness, s_subId, 500000000000143261, true, true, false);
     vm.expectEmit(true, true, false, true, address(s_coordinator));
-    emit RandomWordsFulfilled(output1.requestId, output1.randomness, s_subId, 800000000000306143, false, true, false);
+    emit RandomWordsFulfilled(output1.requestId, output1.randomness, s_subId, 800000000000312358, false, true, false);
 
     // Fulfill the requests.
     s_batchCoordinator.fulfillRandomWords(proofs, rcs);
diff --git a/contracts/src/v0.8/vrf/test/VRFV2Plus.t.sol b/contracts/src/v0.8/vrf/test/VRFV2Plus.t.sol
index 75a8d96927..dd3f54b580 100644
--- a/contracts/src/v0.8/vrf/test/VRFV2Plus.t.sol
+++ b/contracts/src/v0.8/vrf/test/VRFV2Plus.t.sol
@@ -513,26 +513,33 @@ contract VRFV2Plus is BaseTest {
     assertEq(fulfilled, false);
     assertTrue(s_testCoordinator.pendingRequestExists(subId));
 
-    // Uncomment these console logs to see info about the request:
-    // console.log("requestId: ", requestId);
-    // console.log("preSeed: ", preSeed);
-    // console.log("sender: ", address(s_testConsumer));
-
     // Move on to the next block.
     // Store the previous block's blockhash, and assert that it is as expected.
     vm.roll(requestBlock + 1);
     s_bhs.store(requestBlock);
-    assertEq(hex"0000000000000000000000000000000000000000000000000000000000000014", s_bhs.getBlockhash(requestBlock));
+    assertEq(hex"731dc163f73d31d8c68f9917ce4ff967753939f70432973c04fd2c2a48148607", s_bhs.getBlockhash(requestBlock));
 
     // Fulfill the request.
-    // Proof generated via the generate-proof-v2-plus script command. Example usage:
+    // Proof generated via the generate-proof-v2-plus script command.
+    // 1st step: Uncomment these 3 console logs to see info about the request and run the test to get output:
+    // console.log("requestId: ", requestId);
+    // console.log("preSeed: ", preSeed);
+    // console.log("sender: ", address(s_testConsumer));
+    // 2nd step: Update pre-seed in the command commented out below with new value printed in console logs.
+    // 3rd step: export the following environment variables to run the generate-proof-v2-plus script.
+    // export ETH_URL=https://ethereum-sepolia-rpc.publicnode.com # or any other RPC provider you prefer
+    // export ETH_CHAIN_ID=11155111 # or switch to any other chain
+    // export ACCOUNT_KEY=<your test EOA private key>
+    // 4th step: run the command and copy the command output in the proof section below.
     /*
+        Run from this folder: chainlink/core/scripts/vrfv2plus/testnet
         go run . generate-proof-v2-plus \
         -key-hash 0x9f2353bde94264dbc3d554a94cceba2d7d2b4fdce4304d3e09a1fea9fbeb1528 \
-        -pre-seed 58424872742560034068603954318478134981993109073728628043159461959392650534066 \
-        -block-hash 0x0000000000000000000000000000000000000000000000000000000000000014 \
+        -pre-seed 77134414723242246520332717536018735794426514244521954002798799849127623496871 \
+        -block-hash 0x731dc163f73d31d8c68f9917ce4ff967753939f70432973c04fd2c2a48148607 \
         -block-num 20 \
-        -sender 0x90A8820424CC8a819d14cBdE54D12fD3fbFa9bb2
+        -sender 0x90A8820424CC8a819d14cBdE54D12fD3fbFa9bb2 \
+        -native-payment false
     */
     proof = VRF.Proof({
       pk: [
@@ -540,22 +547,22 @@ contract VRFV2Plus is BaseTest {
         62070622898698443831883535403436258712770888294397026493185421712108624767191
       ],
       gamma: [
-        38041205470219573731614166317842050442610096576830191475863676359766283013831,
-        31897503406364148988967447112698248795931483458172800286988696482435433838056
+        103927982338770370318312316555080928288985522873495041111817988974598585393796,
+        56789421278806198480964888112155620425048056183534931202752833185923411715624
       ],
-      c: 114706080610174375269579192101772790158458728655229562781479812703475130740224,
-      s: 91869928024010088265014058436030407245056128545665425448353233998362687232253,
-      seed: 58424872742560034068603954318478134981993109073728628043159461959392650534066,
-      uWitness: 0x1514536B09a51E671d070312bcD3653386d5a82b,
+      c: 23645475075665525321781505993434124657388421977074956645288621921391376468128,
+      s: 106817081950846808215350231311242951539230271757396902089035477907017240898689,
+      seed: 77134414723242246520332717536018735794426514244521954002798799849127623496871,
+      uWitness: 0xD6899602060d574DE03FE1cf76fDf66afE12d549,
       cGammaWitness: [
-        90605489216274499662544489893800286859751132311034850249229378789467669572783,
-        76568417372883461229305641415175605031997103681542349721251313705711146936024
+        9892458071712426452033749279561067220589549155902380165087951541202159693388,
+        61235995320721681444549354910430438435754757626312862714628885100042911955139
       ],
       sHashWitness: [
-        43417948503950579681520475434461454031791886587406480417092620950034789197994,
-        100772571879140362396088596211082924128900752544164141322636815729889228000249
+        101478618362722903511580105256015180591690884037598276249676652094434483808775,
+        82512235485399822034680598942438982472006937353405384896956013889074719896188
       ],
-      zInv: 82374292458278672300647114418593830323283909625362447038989596015264004164958
+      zInv: 82281039329215616805111360985152709712368762415186906218863971780664103705723
     });
     rc = VRFTypes.RequestCommitmentV2Plus({
       blockNum: requestBlock,
@@ -602,24 +609,30 @@ contract VRFV2Plus is BaseTest {
     assertEq(fulfilled, false);
     assertTrue(s_testCoordinator.pendingRequestExists(subId));
 
-    // Uncomment these console logs to see info about the request:
-    // console.log("requestId: ", requestId);
-    // console.log("preSeed: ", preSeed);
-    // console.log("sender: ", address(s_testConsumer));
-
     // Move on to the next block.
     // Store the previous block's blockhash, and assert that it is as expected.
     vm.roll(requestBlock + 1);
     s_bhs.store(requestBlock);
-    assertEq(hex"000000000000000000000000000000000000000000000000000000000000000a", s_bhs.getBlockhash(requestBlock));
+    assertEq(hex"1a192fabce13988b84994d4296e6cdc418d55e2f1d7f942188d4040b94fc57ac", s_bhs.getBlockhash(requestBlock));
 
     // Fulfill the request.
-    // Proof generated via the generate-proof-v2-plus script command. Example usage:
+    // Proof generated via the generate-proof-v2-plus script command.
+    // 1st step: Uncomment these 3 console logs to see info about the request and run the test to get output:
+    // console.log("requestId: ", requestId);
+    // console.log("preSeed: ", preSeed);
+    // console.log("sender: ", address(s_testConsumer));
+    // 2nd step: Update pre-seed in the command commented out below with new value printed in console logs.
+    // 3rd step: export the following environment variables to run the generate-proof-v2-plus script.
+    // export ETH_URL=https://ethereum-sepolia-rpc.publicnode.com # or any other RPC provider you prefer
+    // export ETH_CHAIN_ID=11155111 # or switch to any other chain
+    // export ACCOUNT_KEY=<your test EOA private key>
+    // 4th step: run the command and copy the command output in the proof section below.
     /*
+       Run from this folder: chainlink/core/scripts/vrfv2plus/testnet
        go run . generate-proof-v2-plus \
         -key-hash 0x9f2353bde94264dbc3d554a94cceba2d7d2b4fdce4304d3e09a1fea9fbeb1528 \
-        -pre-seed 83266692323404068105564931899467966321583332182309426611016082057597749986430 \
-        -block-hash 0x000000000000000000000000000000000000000000000000000000000000000a \
+        -pre-seed 88177119495082281213609405072572269421661478022189589823108119237563684383163 \
+        -block-hash 0x1a192fabce13988b84994d4296e6cdc418d55e2f1d7f942188d4040b94fc57ac \
         -block-num 10 \
         -sender 0x90A8820424CC8a819d14cBdE54D12fD3fbFa9bb2 \
         -native-payment true
@@ -630,22 +643,22 @@ contract VRFV2Plus is BaseTest {
         62070622898698443831883535403436258712770888294397026493185421712108624767191
       ],
       gamma: [
-        47144451677122876068574640250190132179872561942855874114516471019540736524783,
-        63001220656590641645486673489302242739512599229187442248048295264418080499391
+        102142782721757938350759722545721736888276217484353597703162772276193136052353,
+        87167280284008869627768921028415708350806510214000539818296353518495698939660
       ],
-      c: 42928477813589729783511577059394077774341588261592343937605454161333818133643,
-      s: 14447529458406454898597883219032514356523135029224613793880920230249515634875,
-      seed: 83266692323404068105564931899467966321583332182309426611016082057597749986430,
-      uWitness: 0x5Ed3bb2AA8EAFe168a23079644d5dfBf892B1038,
+      c: 78738462581063211677832865654743924688552792392007862664964608134754001810280,
+      s: 97066881804257970453329086439696419448135613089654606517271688187030953014593,
+      seed: 88177119495082281213609405072572269421661478022189589823108119237563684383163,
+      uWitness: 0xa335ea8dF652d5331a276B60b16c9733435D4f73,
       cGammaWitness: [
-        40742088032247467257043132769297935807697466810312051815364187117543257089153,
-        110399474382135664619186049639190334359061769014381608543009407662815758204131
+        114435126227922602743444254494036972095649501991695809092954325430947992864624,
+        63032211040463927862594425238691911311087931119674607521158894139074063158678
       ],
       sHashWitness: [
-        26556776392895292893984393164594214244553035014769995354896600239759043777485,
-        67126706735912782218279556535631175449291035782208850310724682668198932501077
+        105043781471073183057173130563345930784924139079040814418442661347864735908726,
+        68696469914696211053833437482938344908217760552761185546164836556562945431554
       ],
-      zInv: 88742453392918610091640193378775723954629905126315835248392650970979000380325
+      zInv: 73325637847357165955904789471972164751975373195750497508525598331798833112175
     });
     rc = VRFTypes.RequestCommitmentV2Plus({
       blockNum: requestBlock,
@@ -750,26 +763,26 @@ contract VRFV2Plus is BaseTest {
     (bool fulfilled, , ) = s_testConsumer.s_requests(requestId);
     assertEq(fulfilled, true);
 
-    // The cost of fulfillRandomWords is approximately 86_700 gas.
+    // The cost of fulfillRandomWords is approximately 89_100 gas.
     // gasAfterPaymentCalculation is 50_000.
     //
     // The cost of the VRF fulfillment charged to the user is:
     // paymentNoFee = (weiPerUnitGas * (gasAfterPaymentCalculation + startGas - gasleft() + l1CostWei) / link_native_ratio)
     // network gas price is capped at gas lane max gas (5000 gwei)
-    // paymentNoFee = (5e12 * (50_000 + 86_700 + 0)) / .5
-    // paymentNoFee = 1.367e+18
+    // paymentNoFee = (5e12 * (50_000 + 89_100 + 0)) / .5
+    // paymentNoFee = 1.391e+18
     // flatFeeWei = 1e12 * (fulfillmentFlatFeeNativePPM - fulfillmentFlatFeeLinkDiscountPPM)
     // flatFeeWei = 1e12 * (500_000 - 100_000)
     // flatFeeJuels = 1e18 * flatFeeWei / link_native_ratio
     // flatFeeJuels = 4e17 / 0.5 = 8e17
     // billed_fee = paymentNoFee * (10 / 100) + 8e17
-    // billed_fee = 1.367e+18 * 0.1 + 8e17
-    // billed_fee = 9.367e+17
+    // billed_fee = 1.391e+18 * 0.1 + 8e17
+    // billed_fee = 9.391e+17
     // note: delta is doubled from the native test to account for more variance due to the link/native ratio
     (uint96 linkBalanceAfter, , , , ) = s_testCoordinator.getSubscription(subId);
     // 1e15 is less than 1 percent discrepancy
-    assertApproxEqAbs(payment, 9.367 * 1e17, 1e15);
-    assertApproxEqAbs(linkBalanceAfter, linkBalanceBefore - 9.367 * 1e17, 1e15);
+    assertApproxEqAbs(payment, 9.391 * 1e17, 1e15);
+    assertApproxEqAbs(linkBalanceAfter, linkBalanceBefore - 9.391 * 1e17, 1e15);
     assertFalse(s_testCoordinator.pendingRequestExists(subId));
   }
 
@@ -834,24 +847,30 @@ contract VRFV2Plus is BaseTest {
     );
     assertTrue(s_testCoordinator.pendingRequestExists(subId));
 
-    // 3. Fulfill the request above
-    //console.log("requestId: ", requestId);
-    //console.log("preSeed: ", preSeed);
-    //console.log("sender: ", address(consumer));
-
     // Move on to the next block.
     // Store the previous block's blockhash, and assert that it is as expected.
     vm.roll(requestBlock + 1);
     s_bhs.store(requestBlock);
-    assertEq(hex"000000000000000000000000000000000000000000000000000000000000000a", s_bhs.getBlockhash(requestBlock));
+    assertEq(hex"1a192fabce13988b84994d4296e6cdc418d55e2f1d7f942188d4040b94fc57ac", s_bhs.getBlockhash(requestBlock));
 
-    // Fulfill the request.
-    // Proof generated via the generate-proof-v2-plus script command. Example usage:
+    // 3. Fulfill the request above
+    // Proof generated via the generate-proof-v2-plus script command.
+    // 1st step: Uncomment these 3 console logs to see info about the request and run the test to get output:
+    // console.log("requestId: ", requestId);
+    // console.log("preSeed: ", preSeed);
+    // console.log("sender: ", address(s_testConsumer));
+    // 2nd step: Update pre-seed in the command commented out below with new value printed in console logs.
+    // 3rd step: export the following environment variables to run the generate-proof-v2-plus script.
+    // export ETH_URL=https://ethereum-sepolia-rpc.publicnode.com # or any other RPC provider you prefer
+    // export ETH_CHAIN_ID=11155111 # or switch to any other chain
+    // export ACCOUNT_KEY=<your test EOA private key>
+    // 4th step: run the command and copy the command output in the proof section below.
     /*
+      Run from this folder: chainlink/core/scripts/vrfv2plus/testnet
       go run . generate-proof-v2-plus \
       -key-hash 0x9f2353bde94264dbc3d554a94cceba2d7d2b4fdce4304d3e09a1fea9fbeb1528 \
-      -pre-seed 94043941380654896554739370173616551044559721638888689173752661912204412136884 \
-      -block-hash 0x000000000000000000000000000000000000000000000000000000000000000a \
+      -pre-seed 78857362017365444144484359594634073685493503942324326290718892836953423263381 \
+      -block-hash 0x1a192fabce13988b84994d4296e6cdc418d55e2f1d7f942188d4040b94fc57ac \
       -block-num 10 \
       -sender 0x44CAfC03154A0708F9DCf988681821f648dA74aF \
       -native-payment true
@@ -862,22 +881,22 @@ contract VRFV2Plus is BaseTest {
         62070622898698443831883535403436258712770888294397026493185421712108624767191
       ],
       gamma: [
-        18593555375562408458806406536059989757338587469093035962641476877033456068708,
-        55675218112764789548330682504442195066741636758414578491295297591596761905475
+        65913937398148449626792563067325648649534055460473988721938103219381973178278,
+        63156327344180203180831822252171874192175272818200597638000091892096122362120
       ],
-      c: 56595337384472359782910435918403237878894172750128610188222417200315739516270,
-      s: 60666722370046279064490737533582002977678558769715798604164042022636022215663,
-      seed: 94043941380654896554739370173616551044559721638888689173752661912204412136884,
-      uWitness: 0xEdbE15fd105cfEFb9CCcbBD84403d1F62719E50d,
+      c: 96524997218413735279221574381819903278651909890109201564980667824986706861580,
+      s: 32941032142956097592442894642111025677491308239274769364799856748447418202313,
+      seed: 78857362017365444144484359594634073685493503942324326290718892836953423263381,
+      uWitness: 0xda613621Dc2347d9A6670a1cBA812d52A7ec3A3A,
       cGammaWitness: [
-        11752391553651713021860307604522059957920042356542944931263270793211985356642,
-        14713353048309058367510422609936133400473710094544154206129568172815229277104
+        6776842114900054689355891239487365968068230823400902903493665825747641410781,
+        753482930067864853610521010650481816782338376846697006021590704037205560592
       ],
       sHashWitness: [
-        109716108880570827107616596438987062129934448629902940427517663799192095060206,
-        79378277044196229730810703755304140279837983575681427317104232794580059801930
+        76619528582417858778905184311764104068650968652636772643050945629834129417915,
+        27947566794040118487986033070014357750801611688958204148187927873566412002355
       ],
-      zInv: 18898957977631212231148068121702167284572066246731769473720131179584458697812
+      zInv: 77351076831418813780936064446565588198113457019145030499544500588309236458362
     });
     VRFTypes.RequestCommitmentV2Plus memory rc = VRFTypes.RequestCommitmentV2Plus({
       blockNum: requestBlock,
@@ -988,20 +1007,26 @@ contract VRFV2Plus is BaseTest {
     // Store the previous block's blockhash, and assert that it is as expected.
     vm.roll(requestBlock + 1);
     s_bhs.store(requestBlock);
-    assertEq(hex"000000000000000000000000000000000000000000000000000000000000000a", s_bhs.getBlockhash(requestBlock));
+    assertEq(hex"1a192fabce13988b84994d4296e6cdc418d55e2f1d7f942188d4040b94fc57ac", s_bhs.getBlockhash(requestBlock));
 
     // 3. Fulfill the 1st request above
-    console.log("requestId: ", requestId1);
-    console.log("preSeed: ", preSeed1);
-    console.log("sender: ", address(consumer1));
-
-    // Fulfill the request.
-    // Proof generated via the generate-proof-v2-plus script command. Example usage:
+    // Proof generated via the generate-proof-v2-plus script command.
+    // 1st step: Uncomment these 3 console logs to see info about the request and run the test to get output:
+    // console.log("requestId: ", requestId);
+    // console.log("preSeed: ", preSeed);
+    // console.log("sender: ", address(s_testConsumer));
+    // 2nd step: Update pre-seed in the command commented out below with new value printed in console logs.
+    // 3rd step: export the following environment variables to run the generate-proof-v2-plus script.
+    // export ETH_URL=https://ethereum-sepolia-rpc.publicnode.com # or any other RPC provider you prefer
+    // export ETH_CHAIN_ID=11155111 # or switch to any other chain
+    // export ACCOUNT_KEY=<your test EOA private key>
+    // 4th step: run the command and copy the command output in the proof section below.
     /*
+      Run from this folder: chainlink/core/scripts/vrfv2plus/testnet
       go run . generate-proof-v2-plus \
       -key-hash 0x9f2353bde94264dbc3d554a94cceba2d7d2b4fdce4304d3e09a1fea9fbeb1528 \
-      -pre-seed 94043941380654896554739370173616551044559721638888689173752661912204412136884 \
-      -block-hash 0x000000000000000000000000000000000000000000000000000000000000000a \
+      -pre-seed 78857362017365444144484359594634073685493503942324326290718892836953423263381 \
+      -block-hash 0x1a192fabce13988b84994d4296e6cdc418d55e2f1d7f942188d4040b94fc57ac \
       -block-num 10 \
       -sender 0x44CAfC03154A0708F9DCf988681821f648dA74aF \
       -native-payment true
@@ -1012,22 +1037,22 @@ contract VRFV2Plus is BaseTest {
         62070622898698443831883535403436258712770888294397026493185421712108624767191
       ],
       gamma: [
-        18593555375562408458806406536059989757338587469093035962641476877033456068708,
-        55675218112764789548330682504442195066741636758414578491295297591596761905475
+        65913937398148449626792563067325648649534055460473988721938103219381973178278,
+        63156327344180203180831822252171874192175272818200597638000091892096122362120
       ],
-      c: 56595337384472359782910435918403237878894172750128610188222417200315739516270,
-      s: 60666722370046279064490737533582002977678558769715798604164042022636022215663,
-      seed: 94043941380654896554739370173616551044559721638888689173752661912204412136884,
-      uWitness: 0xEdbE15fd105cfEFb9CCcbBD84403d1F62719E50d,
+      c: 103296526941774692908067234360350834482645116475454593803823148315342533216203,
+      s: 50291245814080656739779812653411869801334231723444391096753849942661931376590,
+      seed: 78857362017365444144484359594634073685493503942324326290718892836953423263381,
+      uWitness: 0x38500711AdcB471ac1A566c4b915759eb9cBCE2F,
       cGammaWitness: [
-        11752391553651713021860307604522059957920042356542944931263270793211985356642,
-        14713353048309058367510422609936133400473710094544154206129568172815229277104
+        56476970720509547210740928951846471668018949971632948991136782499758110143588,
+        44326075300781389077656415325167171692706436527877070415603658305817367373598
       ],
       sHashWitness: [
-        109716108880570827107616596438987062129934448629902940427517663799192095060206,
-        79378277044196229730810703755304140279837983575681427317104232794580059801930
+        109524696164787283409393383708118913934136014139634321235031691839206768278439,
+        52690039857779635909051684567562068782378693408005554345469129234366171822741
       ],
-      zInv: 18898957977631212231148068121702167284572066246731769473720131179584458697812
+      zInv: 108537983043800425266290112227943788107669768716438017124275578856644517258573
     });
     VRFTypes.RequestCommitmentV2Plus memory rc = VRFTypes.RequestCommitmentV2Plus({
       blockNum: requestBlock,
@@ -1040,18 +1065,24 @@ contract VRFV2Plus is BaseTest {
     s_testCoordinator.fulfillRandomWords(proof, rc, true /* onlyPremium */);
     assertTrue(s_testCoordinator.pendingRequestExists(subId));
 
-    //4. Fulfill the 2nd request
-    console.log("requestId: ", requestId2);
-    console.log("preSeed: ", preSeed2);
-    console.log("sender: ", address(consumer2));
-
-    // Fulfill the request.
-    // Proof generated via the generate-proof-v2-plus script command. Example usage:
+    // 4. Fulfill the 2nd request
+    // Proof generated via the generate-proof-v2-plus script command.
+    // 1st step: Uncomment these 3 console logs to see info about the request and run the test to get output:
+    // console.log("requestId: ", requestId);
+    // console.log("preSeed: ", preSeed);
+    // console.log("sender: ", address(s_testConsumer));
+    // 2nd step: Update pre-seed in the command commented out below with new value printed in console logs.
+    // 3rd step: export the following environment variables to run the generate-proof-v2-plus script.
+    // export ETH_URL=https://ethereum-sepolia-rpc.publicnode.com # or any other RPC provider you prefer
+    // export ETH_CHAIN_ID=11155111 # or switch to any other chain
+    // export ACCOUNT_KEY=<your test EOA private key>
+    // 4th step: run the command and copy the command output in the proof section below.
     /*
+      Run from this folder: chainlink/core/scripts/vrfv2plus/testnet
       go run . generate-proof-v2-plus \
       -key-hash 0x9f2353bde94264dbc3d554a94cceba2d7d2b4fdce4304d3e09a1fea9fbeb1528 \
-      -pre-seed 60086281972849674111646805013521068579710860774417505336898013292594859262126 \
-      -block-hash 0x000000000000000000000000000000000000000000000000000000000000000a \
+      -pre-seed 53330100288105770463016865504321558518073051667771993294213115153676065708950 \
+      -block-hash 0x1a192fabce13988b84994d4296e6cdc418d55e2f1d7f942188d4040b94fc57ac \
       -block-num 10 \
       -sender 0xf5a165378E120f93784395aDF1E08a437e902865 \
       -native-payment true
@@ -1062,22 +1093,22 @@ contract VRFV2Plus is BaseTest {
         62070622898698443831883535403436258712770888294397026493185421712108624767191
       ],
       gamma: [
-        8781676794493524976318989249067879326013864868749595045909181134740761572122,
-        70144896394968351242907510966944756907625107566821127114847472296460405612124
+        7260273098301741284457725182313945178888499328441106869722941415453613782770,
+        91648498042618923465107471165504200585847250228048015102713552756245653299952
       ],
-      c: 67847193668837615807355025316836592349514589069599294392546721746916067719949,
-      s: 114946531382736685625345450298146929067341928840493664822961336014597880904075,
-      seed: 60086281972849674111646805013521068579710860774417505336898013292594859262126,
-      uWitness: 0xe1de4fD69277D0C5516cAE4d760b1d08BC340A28,
+      c: 64987886290696558870328339791409334400119338012796549091587853494368167422332,
+      s: 69469162696695326295567645789624554797683340898724555794078876350372084267572,
+      seed: 53330100288105770463016865504321558518073051667771993294213115153676065708950,
+      uWitness: 0xa6ce21aD47eC5E90Ac7a2c6152D9710234Afe8ab,
       cGammaWitness: [
-        90301582727701442026215692513959255065128476395727596945643431833363167168678,
-        61501369717028493801369453424028509804064958915788808540582630993703331669978
+        57318358662553647785891634403735348577492991113152343207139729697842283565417,
+        57942043484796308689103390068712967247519265087617809262260051163954389512396
       ],
       sHashWitness: [
-        98738650825542176387169085844714248077697103572877410412808249468787326424906,
-        85647963391545223707301702874240345890884970941786094239896961457539737216630
+        113345999157319332195230171660555736547709417795439282230372737104445523493539,
+        113358219039155973560933190466797830695088313506343976960055230355894888727567
       ],
-      zInv: 29080001901010358083725892808339807464533563010468652346220922643802059192842
+      zInv: 68349552569605209428774574139615352877146713490794995768725549089572297658255
     });
     rc = VRFTypes.RequestCommitmentV2Plus({
       blockNum: requestBlock,
diff --git a/core/capabilities/ccip/ccip_integration_tests/.gitignore b/core/capabilities/ccip/ccip_integration_tests/.gitignore
deleted file mode 100644
index 567609b123..0000000000
--- a/core/capabilities/ccip/ccip_integration_tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build/
diff --git a/core/capabilities/ccip/ccip_integration_tests/ccipreader/ccipreader_test.go b/core/capabilities/ccip/ccip_integration_tests/ccipreader/ccipreader_test.go
deleted file mode 100644
index a179949d93..0000000000
--- a/core/capabilities/ccip/ccip_integration_tests/ccipreader/ccipreader_test.go
+++ /dev/null
@@ -1,424 +0,0 @@
-package ccipreader
-
-import (
-	"context"
-	"math/big"
-	"sort"
-	"testing"
-	"time"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"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/crypto"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap/zapcore"
-	"golang.org/x/exp/maps"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/types"
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_reader_tester"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	evmtypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
-
-	"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
-	"github.com/smartcontractkit/chainlink-ccip/pkg/contractreader"
-	ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-	"github.com/smartcontractkit/chainlink-ccip/plugintypes"
-)
-
-const (
-	chainS1 = cciptypes.ChainSelector(1)
-	chainS2 = cciptypes.ChainSelector(2)
-	chainS3 = cciptypes.ChainSelector(3)
-	chainD  = cciptypes.ChainSelector(4)
-)
-
-func TestCCIPReader_CommitReportsGTETimestamp(t *testing.T) {
-	ctx := testutils.Context(t)
-
-	cfg := evmtypes.ChainReaderConfig{
-		Contracts: map[string]evmtypes.ChainContractReader{
-			consts.ContractNameOffRamp: {
-				ContractPollingFilter: evmtypes.ContractPollingFilter{
-					GenericEventNames: []string{consts.EventNameCommitReportAccepted},
-				},
-				ContractABI: ccip_reader_tester.CCIPReaderTesterABI,
-				Configs: map[string]*evmtypes.ChainReaderDefinition{
-					consts.EventNameCommitReportAccepted: {
-						ChainSpecificName: consts.EventNameCommitReportAccepted,
-						ReadType:          evmtypes.Event,
-					},
-				},
-			},
-		},
-	}
-
-	s := testSetup(ctx, t, chainD, chainD, nil, cfg)
-
-	tokenA := common.HexToAddress("123")
-	const numReports = 5
-
-	for i := uint8(0); i < numReports; i++ {
-		_, err := s.contract.EmitCommitReportAccepted(s.auth, ccip_reader_tester.OffRampCommitReport{
-			PriceUpdates: ccip_reader_tester.InternalPriceUpdates{
-				TokenPriceUpdates: []ccip_reader_tester.InternalTokenPriceUpdate{
-					{
-						SourceToken: tokenA,
-						UsdPerToken: big.NewInt(1000),
-					},
-				},
-				GasPriceUpdates: []ccip_reader_tester.InternalGasPriceUpdate{
-					{
-						DestChainSelector: uint64(chainD),
-						UsdPerUnitGas:     big.NewInt(90),
-					},
-				},
-			},
-			MerkleRoots: []ccip_reader_tester.OffRampMerkleRoot{
-				{
-					SourceChainSelector: uint64(chainS1),
-					Interval: ccip_reader_tester.OffRampInterval{
-						Min: 10,
-						Max: 20,
-					},
-					MerkleRoot: [32]byte{i + 1},
-				},
-			},
-		})
-		assert.NoError(t, err)
-		s.sb.Commit()
-	}
-
-	// Need to replay as sometimes the logs are not picked up by the log poller (?)
-	// Maybe another situation where chain reader doesn't register filters as expected.
-	require.NoError(t, s.lp.Replay(ctx, 1))
-
-	var reports []plugintypes.CommitPluginReportWithMeta
-	var err error
-	require.Eventually(t, func() bool {
-		reports, err = s.reader.CommitReportsGTETimestamp(
-			ctx,
-			chainD,
-			time.Unix(30, 0), // Skips first report, simulated backend report timestamps are [20, 30, 40, ...]
-			10,
-		)
-		require.NoError(t, err)
-		return len(reports) == numReports-1
-	}, 10*time.Second, 50*time.Millisecond)
-
-	assert.Len(t, reports[0].Report.MerkleRoots, 1)
-	assert.Equal(t, chainS1, reports[0].Report.MerkleRoots[0].ChainSel)
-	assert.Equal(t, cciptypes.SeqNum(10), reports[0].Report.MerkleRoots[0].SeqNumsRange.Start())
-	assert.Equal(t, cciptypes.SeqNum(20), reports[0].Report.MerkleRoots[0].SeqNumsRange.End())
-	assert.Equal(t, "0x0200000000000000000000000000000000000000000000000000000000000000",
-		reports[0].Report.MerkleRoots[0].MerkleRoot.String())
-
-	assert.Equal(t, tokenA.String(), string(reports[0].Report.PriceUpdates.TokenPriceUpdates[0].TokenID))
-	assert.Equal(t, uint64(1000), reports[0].Report.PriceUpdates.TokenPriceUpdates[0].Price.Uint64())
-
-	assert.Equal(t, chainD, reports[0].Report.PriceUpdates.GasPriceUpdates[0].ChainSel)
-	assert.Equal(t, uint64(90), reports[0].Report.PriceUpdates.GasPriceUpdates[0].GasPrice.Uint64())
-}
-
-func TestCCIPReader_ExecutedMessageRanges(t *testing.T) {
-	ctx := testutils.Context(t)
-	cfg := evmtypes.ChainReaderConfig{
-		Contracts: map[string]evmtypes.ChainContractReader{
-			consts.ContractNameOffRamp: {
-				ContractPollingFilter: evmtypes.ContractPollingFilter{
-					GenericEventNames: []string{consts.EventNameExecutionStateChanged},
-				},
-				ContractABI: ccip_reader_tester.CCIPReaderTesterABI,
-				Configs: map[string]*evmtypes.ChainReaderDefinition{
-					consts.EventNameExecutionStateChanged: {
-						ChainSpecificName: consts.EventNameExecutionStateChanged,
-						ReadType:          evmtypes.Event,
-					},
-				},
-			},
-		},
-	}
-
-	s := testSetup(ctx, t, chainD, chainD, nil, cfg)
-
-	_, err := s.contract.EmitExecutionStateChanged(
-		s.auth,
-		uint64(chainS1),
-		14,
-		cciptypes.Bytes32{1, 0, 0, 1},
-		1,
-		[]byte{1, 2, 3, 4},
-	)
-	assert.NoError(t, err)
-	s.sb.Commit()
-
-	_, err = s.contract.EmitExecutionStateChanged(
-		s.auth,
-		uint64(chainS1),
-		15,
-		cciptypes.Bytes32{1, 0, 0, 2},
-		1,
-		[]byte{1, 2, 3, 4, 5},
-	)
-	assert.NoError(t, err)
-	s.sb.Commit()
-
-	// Need to replay as sometimes the logs are not picked up by the log poller (?)
-	// Maybe another situation where chain reader doesn't register filters as expected.
-	require.NoError(t, s.lp.Replay(ctx, 1))
-
-	var executedRanges []cciptypes.SeqNumRange
-	require.Eventually(t, func() bool {
-		executedRanges, err = s.reader.ExecutedMessageRanges(
-			ctx,
-			chainS1,
-			chainD,
-			cciptypes.NewSeqNumRange(14, 15),
-		)
-		require.NoError(t, err)
-		return len(executedRanges) == 2
-	}, testutils.WaitTimeout(t), 50*time.Millisecond)
-
-	assert.Equal(t, cciptypes.SeqNum(14), executedRanges[0].Start())
-	assert.Equal(t, cciptypes.SeqNum(14), executedRanges[0].End())
-
-	assert.Equal(t, cciptypes.SeqNum(15), executedRanges[1].Start())
-	assert.Equal(t, cciptypes.SeqNum(15), executedRanges[1].End())
-}
-
-func TestCCIPReader_MsgsBetweenSeqNums(t *testing.T) {
-	ctx := testutils.Context(t)
-
-	cfg := evmtypes.ChainReaderConfig{
-		Contracts: map[string]evmtypes.ChainContractReader{
-			consts.ContractNameOnRamp: {
-				ContractPollingFilter: evmtypes.ContractPollingFilter{
-					GenericEventNames: []string{consts.EventNameCCIPSendRequested},
-				},
-				ContractABI: ccip_reader_tester.CCIPReaderTesterABI,
-				Configs: map[string]*evmtypes.ChainReaderDefinition{
-					consts.EventNameCCIPSendRequested: {
-						ChainSpecificName: consts.EventNameCCIPSendRequested,
-						ReadType:          evmtypes.Event,
-					},
-				},
-			},
-		},
-	}
-
-	s := testSetup(ctx, t, chainS1, chainD, nil, cfg)
-
-	_, err := s.contract.EmitCCIPSendRequested(s.auth, uint64(chainD), ccip_reader_tester.InternalEVM2AnyRampMessage{
-		Header: ccip_reader_tester.InternalRampMessageHeader{
-			MessageId:           [32]byte{1, 0, 0, 0, 0},
-			SourceChainSelector: uint64(chainS1),
-			DestChainSelector:   uint64(chainD),
-			SequenceNumber:      10,
-		},
-		Sender:         utils.RandomAddress(),
-		Data:           make([]byte, 0),
-		Receiver:       utils.RandomAddress().Bytes(),
-		ExtraArgs:      make([]byte, 0),
-		FeeToken:       utils.RandomAddress(),
-		FeeTokenAmount: big.NewInt(0),
-		TokenAmounts:   make([]ccip_reader_tester.InternalRampTokenAmount, 0),
-	})
-	assert.NoError(t, err)
-
-	_, err = s.contract.EmitCCIPSendRequested(s.auth, uint64(chainD), ccip_reader_tester.InternalEVM2AnyRampMessage{
-		Header: ccip_reader_tester.InternalRampMessageHeader{
-			MessageId:           [32]byte{1, 0, 0, 0, 1},
-			SourceChainSelector: uint64(chainS1),
-			DestChainSelector:   uint64(chainD),
-			SequenceNumber:      15,
-		},
-		Sender:         utils.RandomAddress(),
-		Data:           make([]byte, 0),
-		Receiver:       utils.RandomAddress().Bytes(),
-		ExtraArgs:      make([]byte, 0),
-		FeeToken:       utils.RandomAddress(),
-		FeeTokenAmount: big.NewInt(0),
-		TokenAmounts:   make([]ccip_reader_tester.InternalRampTokenAmount, 0),
-	})
-	assert.NoError(t, err)
-
-	s.sb.Commit()
-
-	// Need to replay as sometimes the logs are not picked up by the log poller (?)
-	// Maybe another situation where chain reader doesn't register filters as expected.
-	require.NoError(t, s.lp.Replay(ctx, 1))
-
-	var msgs []cciptypes.Message
-	require.Eventually(t, func() bool {
-		msgs, err = s.reader.MsgsBetweenSeqNums(
-			ctx,
-			chainS1,
-			cciptypes.NewSeqNumRange(5, 20),
-		)
-		require.NoError(t, err)
-		return len(msgs) == 2
-	}, 10*time.Second, 100*time.Millisecond)
-
-	require.Len(t, msgs, 2)
-	// sort to ensure ascending order of sequence numbers.
-	sort.Slice(msgs, func(i, j int) bool {
-		return msgs[i].Header.SequenceNumber < msgs[j].Header.SequenceNumber
-	})
-	require.Equal(t, cciptypes.SeqNum(10), msgs[0].Header.SequenceNumber)
-	require.Equal(t, cciptypes.SeqNum(15), msgs[1].Header.SequenceNumber)
-	for _, msg := range msgs {
-		require.Equal(t, chainS1, msg.Header.SourceChainSelector)
-		require.Equal(t, chainD, msg.Header.DestChainSelector)
-	}
-}
-
-func TestCCIPReader_NextSeqNum(t *testing.T) {
-	ctx := testutils.Context(t)
-
-	onChainSeqNums := map[cciptypes.ChainSelector]cciptypes.SeqNum{
-		chainS1: 10,
-		chainS2: 20,
-		chainS3: 30,
-	}
-
-	cfg := evmtypes.ChainReaderConfig{
-		Contracts: map[string]evmtypes.ChainContractReader{
-			consts.ContractNameOffRamp: {
-				ContractABI: ccip_reader_tester.CCIPReaderTesterABI,
-				Configs: map[string]*evmtypes.ChainReaderDefinition{
-					consts.MethodNameGetSourceChainConfig: {
-						ChainSpecificName: "getSourceChainConfig",
-						ReadType:          evmtypes.Method,
-					},
-				},
-			},
-		},
-	}
-
-	s := testSetup(ctx, t, chainD, chainD, onChainSeqNums, cfg)
-
-	seqNums, err := s.reader.NextSeqNum(ctx, []cciptypes.ChainSelector{chainS1, chainS2, chainS3})
-	assert.NoError(t, err)
-	assert.Len(t, seqNums, 3)
-	assert.Equal(t, cciptypes.SeqNum(10), seqNums[0])
-	assert.Equal(t, cciptypes.SeqNum(20), seqNums[1])
-	assert.Equal(t, cciptypes.SeqNum(30), seqNums[2])
-}
-
-func testSetup(ctx context.Context, t *testing.T, readerChain, destChain cciptypes.ChainSelector, onChainSeqNums map[cciptypes.ChainSelector]cciptypes.SeqNum, cfg evmtypes.ChainReaderConfig) *testSetupData {
-	const chainID = 1337
-
-	// Generate a new key pair for the simulated account
-	privateKey, err := crypto.GenerateKey()
-	assert.NoError(t, err)
-	// Set up the genesis account with balance
-	blnc, ok := big.NewInt(0).SetString("999999999999999999999999999999999999", 10)
-	assert.True(t, ok)
-	alloc := map[common.Address]core.GenesisAccount{crypto.PubkeyToAddress(privateKey.PublicKey): {Balance: blnc}}
-	simulatedBackend := backends.NewSimulatedBackend(alloc, 0)
-	// Create a transactor
-
-	auth, err := bind.NewKeyedTransactorWithChainID(privateKey, big.NewInt(chainID))
-	assert.NoError(t, err)
-	auth.GasLimit = uint64(0)
-
-	// Deploy the contract
-	address, _, _, err := ccip_reader_tester.DeployCCIPReaderTester(auth, simulatedBackend)
-	assert.NoError(t, err)
-	simulatedBackend.Commit()
-
-	// Setup contract client
-	contract, err := ccip_reader_tester.NewCCIPReaderTester(address, simulatedBackend)
-	assert.NoError(t, err)
-
-	lggr := logger.TestLogger(t)
-	lggr.SetLogLevel(zapcore.ErrorLevel)
-	db := pgtest.NewSqlxDB(t)
-	lpOpts := logpoller.Opts{
-		PollPeriod:               time.Millisecond,
-		FinalityDepth:            0,
-		BackfillBatchSize:        10,
-		RpcBatchSize:             10,
-		KeepFinalizedBlocksDepth: 100000,
-	}
-	cl := client.NewSimulatedBackendClient(t, simulatedBackend, big.NewInt(0).SetUint64(uint64(readerChain)))
-	headTracker := headtracker.NewSimulatedHeadTracker(cl, lpOpts.UseFinalityTag, lpOpts.FinalityDepth)
-	lp := logpoller.NewLogPoller(logpoller.NewORM(big.NewInt(0).SetUint64(uint64(readerChain)), db, lggr),
-		cl,
-		lggr,
-		headTracker,
-		lpOpts,
-	)
-	assert.NoError(t, lp.Start(ctx))
-
-	for sourceChain, seqNum := range onChainSeqNums {
-		_, err1 := contract.SetSourceChainConfig(auth, uint64(sourceChain), ccip_reader_tester.OffRampSourceChainConfig{
-			IsEnabled: true,
-			MinSeqNr:  uint64(seqNum),
-		})
-		assert.NoError(t, err1)
-		simulatedBackend.Commit()
-		scc, err1 := contract.GetSourceChainConfig(&bind.CallOpts{Context: ctx}, uint64(sourceChain))
-		assert.NoError(t, err1)
-		assert.Equal(t, seqNum, cciptypes.SeqNum(scc.MinSeqNr))
-	}
-
-	contractNames := maps.Keys(cfg.Contracts)
-	assert.Len(t, contractNames, 1, "test setup assumes there is only one contract")
-
-	cr, err := evm.NewChainReaderService(ctx, lggr, lp, headTracker, cl, cfg)
-	require.NoError(t, err)
-
-	extendedCr := contractreader.NewExtendedContractReader(cr)
-	err = extendedCr.Bind(ctx, []types.BoundContract{
-		{
-			Address: address.String(),
-			Name:    contractNames[0],
-		},
-	})
-	require.NoError(t, err)
-
-	err = cr.Start(ctx)
-	require.NoError(t, err)
-
-	contractReaders := map[cciptypes.ChainSelector]contractreader.Extended{readerChain: extendedCr}
-	contractWriters := make(map[cciptypes.ChainSelector]types.ChainWriter)
-	reader := ccipreaderpkg.NewCCIPReaderWithExtendedContractReaders(lggr, contractReaders, contractWriters, destChain)
-
-	t.Cleanup(func() {
-		require.NoError(t, cr.Close())
-		require.NoError(t, lp.Close())
-		require.NoError(t, db.Close())
-	})
-
-	return &testSetupData{
-		contractAddr: address,
-		contract:     contract,
-		sb:           simulatedBackend,
-		auth:         auth,
-		lp:           lp,
-		cl:           cl,
-		reader:       reader,
-	}
-}
-
-type testSetupData struct {
-	contractAddr common.Address
-	contract     *ccip_reader_tester.CCIPReaderTester
-	sb           *backends.SimulatedBackend
-	auth         *bind.TransactOpts
-	lp           logpoller.LogPoller
-	cl           client.Client
-	reader       ccipreaderpkg.CCIPReader
-}
diff --git a/core/capabilities/ccip/ccip_integration_tests/chainreader/Makefile b/core/capabilities/ccip/ccip_integration_tests/chainreader/Makefile
deleted file mode 100644
index e9c88564e6..0000000000
--- a/core/capabilities/ccip/ccip_integration_tests/chainreader/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# IMPORTANT: If you encounter any issues try using solc 0.8.18 and abigen 1.14.5
-
-.PHONY: build
-build:
-	rm -rf build/
-	solc --evm-version paris --abi --bin mycontract.sol -o build
-	abigen --abi build/mycontract_sol_SimpleContract.abi --bin build/mycontract_sol_SimpleContract.bin --pkg=chainreader --out=mycontract.go
-
-.PHONY: test
-test: build
-	go test -v --tags "playground" ./...
diff --git a/core/capabilities/ccip/ccip_integration_tests/chainreader/chainreader_test.go b/core/capabilities/ccip/ccip_integration_tests/chainreader/chainreader_test.go
deleted file mode 100644
index 52a3de0dae..0000000000
--- a/core/capabilities/ccip/ccip_integration_tests/chainreader/chainreader_test.go
+++ /dev/null
@@ -1,273 +0,0 @@
-//go:build playground
-// +build playground
-
-package chainreader
-
-import (
-	"context"
-	_ "embed"
-	"math/big"
-	"strconv"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"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/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/codec"
-	types2 "github.com/smartcontractkit/chainlink-common/pkg/types"
-	query2 "github.com/smartcontractkit/chainlink-common/pkg/types/query"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	logger2 "github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	evmtypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
-)
-
-const chainID = 1337
-
-type testSetupData struct {
-	contractAddr common.Address
-	contract     *Chainreader
-	sb           *backends.SimulatedBackend
-	auth         *bind.TransactOpts
-}
-
-func TestChainReader(t *testing.T) {
-	ctx := testutils.Context(t)
-	lggr := logger2.NullLogger
-	d := testSetup(t, ctx)
-
-	db := pgtest.NewSqlxDB(t)
-	lpOpts := logpoller.Opts{
-		PollPeriod:               time.Millisecond,
-		FinalityDepth:            0,
-		BackfillBatchSize:        10,
-		RpcBatchSize:             10,
-		KeepFinalizedBlocksDepth: 100000,
-	}
-	cl := client.NewSimulatedBackendClient(t, d.sb, big.NewInt(chainID))
-	headTracker := headtracker.NewSimulatedHeadTracker(cl, lpOpts.UseFinalityTag, lpOpts.FinalityDepth)
-	lp := logpoller.NewLogPoller(logpoller.NewORM(big.NewInt(chainID), db, lggr),
-		cl,
-		lggr,
-		headTracker,
-		lpOpts,
-	)
-	assert.NoError(t, lp.Start(ctx))
-
-	const (
-		ContractNameAlias = "myCoolContract"
-
-		FnAliasGetCount = "myCoolFunction"
-		FnGetCount      = "getEventCount"
-
-		FnAliasGetNumbers = "GetNumbers"
-		FnGetNumbers      = "getNumbers"
-
-		FnAliasGetPerson = "GetPerson"
-		FnGetPerson      = "getPerson"
-
-		EventNameAlias = "myCoolEvent"
-		EventName      = "SimpleEvent"
-	)
-
-	// Initialize chainReader
-	cfg := evmtypes.ChainReaderConfig{
-		Contracts: map[string]evmtypes.ChainContractReader{
-			ContractNameAlias: {
-				ContractPollingFilter: evmtypes.ContractPollingFilter{
-					GenericEventNames: []string{EventNameAlias},
-				},
-				ContractABI: ChainreaderMetaData.ABI,
-				Configs: map[string]*evmtypes.ChainReaderDefinition{
-					EventNameAlias: {
-						ChainSpecificName:       EventName,
-						ReadType:                evmtypes.Event,
-						ConfidenceConfirmations: map[string]int{"0.0": 0, "1.0": 0},
-					},
-					FnAliasGetCount: {
-						ChainSpecificName: FnGetCount,
-					},
-					FnAliasGetNumbers: {
-						ChainSpecificName:   FnGetNumbers,
-						OutputModifications: codec.ModifiersConfig{},
-					},
-					FnAliasGetPerson: {
-						ChainSpecificName: FnGetPerson,
-						OutputModifications: codec.ModifiersConfig{
-							&codec.RenameModifierConfig{
-								Fields: map[string]string{"Name": "NameField"}, // solidity name -> go struct name
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	cr, err := evm.NewChainReaderService(ctx, lggr, lp, cl, cfg)
-	assert.NoError(t, err)
-	err = cr.Bind(ctx, []types2.BoundContract{
-		{
-			Address: d.contractAddr.String(),
-			Name:    ContractNameAlias,
-			Pending: false,
-		},
-	})
-	assert.NoError(t, err)
-
-	err = cr.Start(ctx)
-	assert.NoError(t, err)
-	for {
-		if err := cr.Ready(); err == nil {
-			break
-		}
-	}
-
-	emitEvents(t, d, ctx) // Calls the contract to emit events
-
-	// (hack) Sometimes LP logs are missing, commit several times and wait few seconds to make it work.
-	for i := 0; i < 100; i++ {
-		d.sb.Commit()
-	}
-	time.Sleep(5 * time.Second)
-
-	t.Run("simple contract read", func(t *testing.T) {
-		var cnt big.Int
-		err = cr.GetLatestValue(ctx, ContractNameAlias, FnAliasGetCount, map[string]interface{}{}, &cnt)
-		assert.NoError(t, err)
-		assert.Equal(t, int64(10), cnt.Int64())
-	})
-
-	t.Run("read array", func(t *testing.T) {
-		var nums []big.Int
-		err = cr.GetLatestValue(ctx, ContractNameAlias, FnAliasGetNumbers, map[string]interface{}{}, &nums)
-		assert.NoError(t, err)
-		assert.Len(t, nums, 10)
-		for i := 1; i <= 10; i++ {
-			assert.Equal(t, int64(i), nums[i-1].Int64())
-		}
-	})
-
-	t.Run("read struct", func(t *testing.T) {
-		person := struct {
-			NameField string
-			Age       *big.Int // WARN: specifying a wrong data type e.g. int instead of *big.Int fails silently with a default value of 0
-		}{}
-		err = cr.GetLatestValue(ctx, ContractNameAlias, FnAliasGetPerson, map[string]interface{}{}, &person)
-		assert.Equal(t, "Dim", person.NameField)
-		assert.Equal(t, int64(18), person.Age.Int64())
-	})
-
-	t.Run("read events", func(t *testing.T) {
-		var myDataType *big.Int
-		seq, err := cr.QueryKey(
-			ctx,
-			ContractNameAlias,
-			query2.KeyFilter{
-				Key:         EventNameAlias,
-				Expressions: []query2.Expression{},
-			},
-			query2.LimitAndSort{},
-			myDataType,
-		)
-		assert.NoError(t, err)
-		assert.Equal(t, 10, len(seq), "expected 10 events from chain reader")
-		for _, v := range seq {
-			// TODO: for some reason log poller does not populate event data
-			blockNum, err := strconv.ParseUint(v.Identifier, 10, 64)
-			assert.NoError(t, err)
-			assert.Positive(t, blockNum)
-			t.Logf("(chain reader) got event: (data=%v) (hash=%x)", v.Data, v.Hash)
-		}
-	})
-}
-
-func testSetup(t *testing.T, ctx context.Context) *testSetupData {
-	// Generate a new key pair for the simulated account
-	privateKey, err := crypto.GenerateKey()
-	assert.NoError(t, err)
-	// Set up the genesis account with balance
-	blnc, ok := big.NewInt(0).SetString("999999999999999999999999999999999999", 10)
-	assert.True(t, ok)
-	alloc := map[common.Address]core.GenesisAccount{crypto.PubkeyToAddress(privateKey.PublicKey): {Balance: blnc}}
-	simulatedBackend := backends.NewSimulatedBackend(alloc, 0)
-	// Create a transactor
-
-	auth, err := bind.NewKeyedTransactorWithChainID(privateKey, big.NewInt(chainID))
-	assert.NoError(t, err)
-	auth.GasLimit = uint64(0)
-
-	// Deploy the contract
-	address, tx, _, err := DeployChainreader(auth, simulatedBackend)
-	assert.NoError(t, err)
-	simulatedBackend.Commit()
-	t.Logf("contract deployed: addr=%s tx=%s", address.Hex(), tx.Hash())
-
-	// Setup contract client
-	contract, err := NewChainreader(address, simulatedBackend)
-	assert.NoError(t, err)
-
-	return &testSetupData{
-		contractAddr: address,
-		contract:     contract,
-		sb:           simulatedBackend,
-		auth:         auth,
-	}
-}
-
-func emitEvents(t *testing.T, d *testSetupData, ctx context.Context) {
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	// Start emitting events
-	go func() {
-		defer wg.Done()
-		for i := 0; i < 10; i++ {
-			_, err := d.contract.EmitEvent(d.auth)
-			assert.NoError(t, err)
-			d.sb.Commit()
-		}
-	}()
-
-	// Listen events using go-ethereum lib
-	go func() {
-		query := ethereum.FilterQuery{
-			FromBlock: big.NewInt(0),
-			Addresses: []common.Address{d.contractAddr},
-		}
-		logs := make(chan types.Log)
-		sub, err := d.sb.SubscribeFilterLogs(ctx, query, logs)
-		assert.NoError(t, err)
-
-		numLogs := 0
-		defer wg.Done()
-		for {
-			// Wait for the events
-			select {
-			case err := <-sub.Err():
-				assert.NoError(t, err, "got an unexpected error")
-			case vLog := <-logs:
-				assert.Equal(t, d.contractAddr, vLog.Address, "got an unexpected address")
-				t.Logf("(geth) got new log (cnt=%d) (data=%x) (topics=%s)", numLogs, vLog.Data, vLog.Topics)
-				numLogs++
-				if numLogs == 10 {
-					return
-				}
-			}
-		}
-	}()
-
-	wg.Wait() // wait for all the events to be consumed
-}
diff --git a/core/capabilities/ccip/ccip_integration_tests/chainreader/mycontract.go b/core/capabilities/ccip/ccip_integration_tests/chainreader/mycontract.go
deleted file mode 100644
index c7d480eed4..0000000000
--- a/core/capabilities/ccip/ccip_integration_tests/chainreader/mycontract.go
+++ /dev/null
@@ -1,519 +0,0 @@
-// Code generated - DO NOT EDIT.
-// This file is a generated binding and any manual changes will be lost.
-
-package chainreader
-
-import (
-	"errors"
-	"math/big"
-	"strings"
-
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var (
-	_ = errors.New
-	_ = big.NewInt
-	_ = strings.NewReader
-	_ = ethereum.NotFound
-	_ = bind.Bind
-	_ = common.Big1
-	_ = types.BloomLookup
-	_ = event.NewSubscription
-	_ = abi.ConvertType
-)
-
-// SimpleContractPerson is an auto generated low-level Go binding around an user-defined struct.
-type SimpleContractPerson struct {
-	Name string
-	Age  *big.Int
-}
-
-// ChainreaderMetaData contains all meta data concerning the Chainreader contract.
-var ChainreaderMetaData = &bind.MetaData{
-	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"SimpleEvent\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"emitEvent\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"eventCount\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getEventCount\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getNumbers\",\"outputs\":[{\"internalType\":\"uint256[]\",\"name\":\"\",\"type\":\"uint256[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getPerson\",\"outputs\":[{\"components\":[{\"internalType\":\"string\",\"name\":\"name\",\"type\":\"string\"},{\"internalType\":\"uint256\",\"name\":\"age\",\"type\":\"uint256\"}],\"internalType\":\"structSimpleContract.Person\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"numbers\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
-	Bin: "0x608060405234801561001057600080fd5b506105a1806100206000396000f3fe608060405234801561001057600080fd5b50600436106100625760003560e01c806371be2e4a146100675780637b0cb8391461008557806389f915f61461008f5780638ec4dc95146100ad578063d39fa233146100cb578063d9e48f5c146100fb575b600080fd5b61006f610119565b60405161007c91906102ac565b60405180910390f35b61008d61011f565b005b61009761019c565b6040516100a49190610385565b60405180910390f35b6100b56101f4565b6040516100c29190610474565b60405180910390f35b6100e560048036038101906100e091906104c7565b61024c565b6040516100f291906102ac565b60405180910390f35b610103610270565b60405161011091906102ac565b60405180910390f35b60005481565b60008081548092919061013190610523565b9190505550600160005490806001815401808255809150506001900390600052602060002001600090919091909150557f12d199749b3f4c44df8d9386c63d725b7756ec47204f3aa0bf05ea832f89effb60005460405161019291906102ac565b60405180910390a1565b606060018054806020026020016040519081016040528092919081815260200182805480156101ea57602002820191906000526020600020905b8154815260200190600101908083116101d6575b5050505050905090565b6101fc610279565b60405180604001604052806040518060400160405280600381526020017f44696d000000000000000000000000000000000000000000000000000000000081525081526020016012815250905090565b6001818154811061025c57600080fd5b906000526020600020016000915090505481565b60008054905090565b604051806040016040528060608152602001600081525090565b6000819050919050565b6102a681610293565b82525050565b60006020820190506102c1600083018461029d565b92915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b6102fc81610293565b82525050565b600061030e83836102f3565b60208301905092915050565b6000602082019050919050565b6000610332826102c7565b61033c81856102d2565b9350610347836102e3565b8060005b8381101561037857815161035f8882610302565b975061036a8361031a565b92505060018101905061034b565b5085935050505092915050565b6000602082019050818103600083015261039f8184610327565b905092915050565b600081519050919050565b600082825260208201905092915050565b60005b838110156103e15780820151818401526020810190506103c6565b60008484015250505050565b6000601f19601f8301169050919050565b6000610409826103a7565b61041381856103b2565b93506104238185602086016103c3565b61042c816103ed565b840191505092915050565b6000604083016000830151848203600086015261045482826103fe565b915050602083015161046960208601826102f3565b508091505092915050565b6000602082019050818103600083015261048e8184610437565b905092915050565b600080fd5b6104a481610293565b81146104af57600080fd5b50565b6000813590506104c18161049b565b92915050565b6000602082840312156104dd576104dc610496565b5b60006104eb848285016104b2565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061052e82610293565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036105605761055f6104f4565b5b60018201905091905056fea2646970667358221220f7986dc9efbc0d9ef58e2925ffddc62ea13a6bab8b3a2c03ad2d85d50653129664736f6c63430008120033",
-}
-
-// ChainreaderABI is the input ABI used to generate the binding from.
-// Deprecated: Use ChainreaderMetaData.ABI instead.
-var ChainreaderABI = ChainreaderMetaData.ABI
-
-// ChainreaderBin is the compiled bytecode used for deploying new contracts.
-// Deprecated: Use ChainreaderMetaData.Bin instead.
-var ChainreaderBin = ChainreaderMetaData.Bin
-
-// DeployChainreader deploys a new Ethereum contract, binding an instance of Chainreader to it.
-func DeployChainreader(auth *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, *Chainreader, error) {
-	parsed, err := ChainreaderMetaData.GetAbi()
-	if err != nil {
-		return common.Address{}, nil, nil, err
-	}
-	if parsed == nil {
-		return common.Address{}, nil, nil, errors.New("GetABI returned nil")
-	}
-
-	address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(ChainreaderBin), backend)
-	if err != nil {
-		return common.Address{}, nil, nil, err
-	}
-	return address, tx, &Chainreader{ChainreaderCaller: ChainreaderCaller{contract: contract}, ChainreaderTransactor: ChainreaderTransactor{contract: contract}, ChainreaderFilterer: ChainreaderFilterer{contract: contract}}, nil
-}
-
-// Chainreader is an auto generated Go binding around an Ethereum contract.
-type Chainreader struct {
-	ChainreaderCaller     // Read-only binding to the contract
-	ChainreaderTransactor // Write-only binding to the contract
-	ChainreaderFilterer   // Log filterer for contract events
-}
-
-// ChainreaderCaller is an auto generated read-only Go binding around an Ethereum contract.
-type ChainreaderCaller struct {
-	contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// ChainreaderTransactor is an auto generated write-only Go binding around an Ethereum contract.
-type ChainreaderTransactor struct {
-	contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// ChainreaderFilterer is an auto generated log filtering Go binding around an Ethereum contract events.
-type ChainreaderFilterer struct {
-	contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// ChainreaderSession is an auto generated Go binding around an Ethereum contract,
-// with pre-set call and transact options.
-type ChainreaderSession struct {
-	Contract     *Chainreader      // Generic contract binding to set the session for
-	CallOpts     bind.CallOpts     // Call options to use throughout this session
-	TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
-}
-
-// ChainreaderCallerSession is an auto generated read-only Go binding around an Ethereum contract,
-// with pre-set call options.
-type ChainreaderCallerSession struct {
-	Contract *ChainreaderCaller // Generic contract caller binding to set the session for
-	CallOpts bind.CallOpts      // Call options to use throughout this session
-}
-
-// ChainreaderTransactorSession is an auto generated write-only Go binding around an Ethereum contract,
-// with pre-set transact options.
-type ChainreaderTransactorSession struct {
-	Contract     *ChainreaderTransactor // Generic contract transactor binding to set the session for
-	TransactOpts bind.TransactOpts      // Transaction auth options to use throughout this session
-}
-
-// ChainreaderRaw is an auto generated low-level Go binding around an Ethereum contract.
-type ChainreaderRaw struct {
-	Contract *Chainreader // Generic contract binding to access the raw methods on
-}
-
-// ChainreaderCallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract.
-type ChainreaderCallerRaw struct {
-	Contract *ChainreaderCaller // Generic read-only contract binding to access the raw methods on
-}
-
-// ChainreaderTransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract.
-type ChainreaderTransactorRaw struct {
-	Contract *ChainreaderTransactor // Generic write-only contract binding to access the raw methods on
-}
-
-// NewChainreader creates a new instance of Chainreader, bound to a specific deployed contract.
-func NewChainreader(address common.Address, backend bind.ContractBackend) (*Chainreader, error) {
-	contract, err := bindChainreader(address, backend, backend, backend)
-	if err != nil {
-		return nil, err
-	}
-	return &Chainreader{ChainreaderCaller: ChainreaderCaller{contract: contract}, ChainreaderTransactor: ChainreaderTransactor{contract: contract}, ChainreaderFilterer: ChainreaderFilterer{contract: contract}}, nil
-}
-
-// NewChainreaderCaller creates a new read-only instance of Chainreader, bound to a specific deployed contract.
-func NewChainreaderCaller(address common.Address, caller bind.ContractCaller) (*ChainreaderCaller, error) {
-	contract, err := bindChainreader(address, caller, nil, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &ChainreaderCaller{contract: contract}, nil
-}
-
-// NewChainreaderTransactor creates a new write-only instance of Chainreader, bound to a specific deployed contract.
-func NewChainreaderTransactor(address common.Address, transactor bind.ContractTransactor) (*ChainreaderTransactor, error) {
-	contract, err := bindChainreader(address, nil, transactor, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &ChainreaderTransactor{contract: contract}, nil
-}
-
-// NewChainreaderFilterer creates a new log filterer instance of Chainreader, bound to a specific deployed contract.
-func NewChainreaderFilterer(address common.Address, filterer bind.ContractFilterer) (*ChainreaderFilterer, error) {
-	contract, err := bindChainreader(address, nil, nil, filterer)
-	if err != nil {
-		return nil, err
-	}
-	return &ChainreaderFilterer{contract: contract}, nil
-}
-
-// bindChainreader binds a generic wrapper to an already deployed contract.
-func bindChainreader(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
-	parsed, err := ChainreaderMetaData.GetAbi()
-	if err != nil {
-		return nil, err
-	}
-	return bind.NewBoundContract(address, *parsed, caller, transactor, filterer), nil
-}
-
-// Call invokes the (constant) contract method with params as input values and
-// sets the output to result. The result type might be a single field for simple
-// returns, a slice of interfaces for anonymous returns and a struct for named
-// returns.
-func (_Chainreader *ChainreaderRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
-	return _Chainreader.Contract.ChainreaderCaller.contract.Call(opts, result, method, params...)
-}
-
-// Transfer initiates a plain transaction to move funds to the contract, calling
-// its default method if one is available.
-func (_Chainreader *ChainreaderRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _Chainreader.Contract.ChainreaderTransactor.contract.Transfer(opts)
-}
-
-// Transact invokes the (paid) contract method with params as input values.
-func (_Chainreader *ChainreaderRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
-	return _Chainreader.Contract.ChainreaderTransactor.contract.Transact(opts, method, params...)
-}
-
-// Call invokes the (constant) contract method with params as input values and
-// sets the output to result. The result type might be a single field for simple
-// returns, a slice of interfaces for anonymous returns and a struct for named
-// returns.
-func (_Chainreader *ChainreaderCallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
-	return _Chainreader.Contract.contract.Call(opts, result, method, params...)
-}
-
-// Transfer initiates a plain transaction to move funds to the contract, calling
-// its default method if one is available.
-func (_Chainreader *ChainreaderTransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _Chainreader.Contract.contract.Transfer(opts)
-}
-
-// Transact invokes the (paid) contract method with params as input values.
-func (_Chainreader *ChainreaderTransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
-	return _Chainreader.Contract.contract.Transact(opts, method, params...)
-}
-
-// EventCount is a free data retrieval call binding the contract method 0x71be2e4a.
-//
-// Solidity: function eventCount() view returns(uint256)
-func (_Chainreader *ChainreaderCaller) EventCount(opts *bind.CallOpts) (*big.Int, error) {
-	var out []interface{}
-	err := _Chainreader.contract.Call(opts, &out, "eventCount")
-
-	if err != nil {
-		return *new(*big.Int), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
-
-	return out0, err
-
-}
-
-// EventCount is a free data retrieval call binding the contract method 0x71be2e4a.
-//
-// Solidity: function eventCount() view returns(uint256)
-func (_Chainreader *ChainreaderSession) EventCount() (*big.Int, error) {
-	return _Chainreader.Contract.EventCount(&_Chainreader.CallOpts)
-}
-
-// EventCount is a free data retrieval call binding the contract method 0x71be2e4a.
-//
-// Solidity: function eventCount() view returns(uint256)
-func (_Chainreader *ChainreaderCallerSession) EventCount() (*big.Int, error) {
-	return _Chainreader.Contract.EventCount(&_Chainreader.CallOpts)
-}
-
-// GetEventCount is a free data retrieval call binding the contract method 0xd9e48f5c.
-//
-// Solidity: function getEventCount() view returns(uint256)
-func (_Chainreader *ChainreaderCaller) GetEventCount(opts *bind.CallOpts) (*big.Int, error) {
-	var out []interface{}
-	err := _Chainreader.contract.Call(opts, &out, "getEventCount")
-
-	if err != nil {
-		return *new(*big.Int), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
-
-	return out0, err
-
-}
-
-// GetEventCount is a free data retrieval call binding the contract method 0xd9e48f5c.
-//
-// Solidity: function getEventCount() view returns(uint256)
-func (_Chainreader *ChainreaderSession) GetEventCount() (*big.Int, error) {
-	return _Chainreader.Contract.GetEventCount(&_Chainreader.CallOpts)
-}
-
-// GetEventCount is a free data retrieval call binding the contract method 0xd9e48f5c.
-//
-// Solidity: function getEventCount() view returns(uint256)
-func (_Chainreader *ChainreaderCallerSession) GetEventCount() (*big.Int, error) {
-	return _Chainreader.Contract.GetEventCount(&_Chainreader.CallOpts)
-}
-
-// GetNumbers is a free data retrieval call binding the contract method 0x89f915f6.
-//
-// Solidity: function getNumbers() view returns(uint256[])
-func (_Chainreader *ChainreaderCaller) GetNumbers(opts *bind.CallOpts) ([]*big.Int, error) {
-	var out []interface{}
-	err := _Chainreader.contract.Call(opts, &out, "getNumbers")
-
-	if err != nil {
-		return *new([]*big.Int), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new([]*big.Int)).(*[]*big.Int)
-
-	return out0, err
-
-}
-
-// GetNumbers is a free data retrieval call binding the contract method 0x89f915f6.
-//
-// Solidity: function getNumbers() view returns(uint256[])
-func (_Chainreader *ChainreaderSession) GetNumbers() ([]*big.Int, error) {
-	return _Chainreader.Contract.GetNumbers(&_Chainreader.CallOpts)
-}
-
-// GetNumbers is a free data retrieval call binding the contract method 0x89f915f6.
-//
-// Solidity: function getNumbers() view returns(uint256[])
-func (_Chainreader *ChainreaderCallerSession) GetNumbers() ([]*big.Int, error) {
-	return _Chainreader.Contract.GetNumbers(&_Chainreader.CallOpts)
-}
-
-// GetPerson is a free data retrieval call binding the contract method 0x8ec4dc95.
-//
-// Solidity: function getPerson() pure returns((string,uint256))
-func (_Chainreader *ChainreaderCaller) GetPerson(opts *bind.CallOpts) (SimpleContractPerson, error) {
-	var out []interface{}
-	err := _Chainreader.contract.Call(opts, &out, "getPerson")
-
-	if err != nil {
-		return *new(SimpleContractPerson), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(SimpleContractPerson)).(*SimpleContractPerson)
-
-	return out0, err
-
-}
-
-// GetPerson is a free data retrieval call binding the contract method 0x8ec4dc95.
-//
-// Solidity: function getPerson() pure returns((string,uint256))
-func (_Chainreader *ChainreaderSession) GetPerson() (SimpleContractPerson, error) {
-	return _Chainreader.Contract.GetPerson(&_Chainreader.CallOpts)
-}
-
-// GetPerson is a free data retrieval call binding the contract method 0x8ec4dc95.
-//
-// Solidity: function getPerson() pure returns((string,uint256))
-func (_Chainreader *ChainreaderCallerSession) GetPerson() (SimpleContractPerson, error) {
-	return _Chainreader.Contract.GetPerson(&_Chainreader.CallOpts)
-}
-
-// Numbers is a free data retrieval call binding the contract method 0xd39fa233.
-//
-// Solidity: function numbers(uint256 ) view returns(uint256)
-func (_Chainreader *ChainreaderCaller) Numbers(opts *bind.CallOpts, arg0 *big.Int) (*big.Int, error) {
-	var out []interface{}
-	err := _Chainreader.contract.Call(opts, &out, "numbers", arg0)
-
-	if err != nil {
-		return *new(*big.Int), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
-
-	return out0, err
-
-}
-
-// Numbers is a free data retrieval call binding the contract method 0xd39fa233.
-//
-// Solidity: function numbers(uint256 ) view returns(uint256)
-func (_Chainreader *ChainreaderSession) Numbers(arg0 *big.Int) (*big.Int, error) {
-	return _Chainreader.Contract.Numbers(&_Chainreader.CallOpts, arg0)
-}
-
-// Numbers is a free data retrieval call binding the contract method 0xd39fa233.
-//
-// Solidity: function numbers(uint256 ) view returns(uint256)
-func (_Chainreader *ChainreaderCallerSession) Numbers(arg0 *big.Int) (*big.Int, error) {
-	return _Chainreader.Contract.Numbers(&_Chainreader.CallOpts, arg0)
-}
-
-// EmitEvent is a paid mutator transaction binding the contract method 0x7b0cb839.
-//
-// Solidity: function emitEvent() returns()
-func (_Chainreader *ChainreaderTransactor) EmitEvent(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _Chainreader.contract.Transact(opts, "emitEvent")
-}
-
-// EmitEvent is a paid mutator transaction binding the contract method 0x7b0cb839.
-//
-// Solidity: function emitEvent() returns()
-func (_Chainreader *ChainreaderSession) EmitEvent() (*types.Transaction, error) {
-	return _Chainreader.Contract.EmitEvent(&_Chainreader.TransactOpts)
-}
-
-// EmitEvent is a paid mutator transaction binding the contract method 0x7b0cb839.
-//
-// Solidity: function emitEvent() returns()
-func (_Chainreader *ChainreaderTransactorSession) EmitEvent() (*types.Transaction, error) {
-	return _Chainreader.Contract.EmitEvent(&_Chainreader.TransactOpts)
-}
-
-// ChainreaderSimpleEventIterator is returned from FilterSimpleEvent and is used to iterate over the raw logs and unpacked data for SimpleEvent events raised by the Chainreader contract.
-type ChainreaderSimpleEventIterator struct {
-	Event *ChainreaderSimpleEvent // Event containing the contract specifics and raw log
-
-	contract *bind.BoundContract // Generic contract to use for unpacking event data
-	event    string              // Event name to use for unpacking event data
-
-	logs chan types.Log        // Log channel receiving the found contract events
-	sub  ethereum.Subscription // Subscription for errors, completion and termination
-	done bool                  // Whether the subscription completed delivering logs
-	fail error                 // Occurred error to stop iteration
-}
-
-// Next advances the iterator to the subsequent event, returning whether there
-// are any more events found. In case of a retrieval or parsing error, false is
-// returned and Error() can be queried for the exact failure.
-func (it *ChainreaderSimpleEventIterator) Next() bool {
-	// If the iterator failed, stop iterating
-	if it.fail != nil {
-		return false
-	}
-	// If the iterator completed, deliver directly whatever's available
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(ChainreaderSimpleEvent)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-	// Iterator still in progress, wait for either a data or an error event
-	select {
-	case log := <-it.logs:
-		it.Event = new(ChainreaderSimpleEvent)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-// Error returns any retrieval or parsing error occurred during filtering.
-func (it *ChainreaderSimpleEventIterator) Error() error {
-	return it.fail
-}
-
-// Close terminates the iteration process, releasing any pending underlying
-// resources.
-func (it *ChainreaderSimpleEventIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-// ChainreaderSimpleEvent represents a SimpleEvent event raised by the Chainreader contract.
-type ChainreaderSimpleEvent struct {
-	Value *big.Int
-	Raw   types.Log // Blockchain specific contextual infos
-}
-
-// FilterSimpleEvent is a free log retrieval operation binding the contract event 0x12d199749b3f4c44df8d9386c63d725b7756ec47204f3aa0bf05ea832f89effb.
-//
-// Solidity: event SimpleEvent(uint256 value)
-func (_Chainreader *ChainreaderFilterer) FilterSimpleEvent(opts *bind.FilterOpts) (*ChainreaderSimpleEventIterator, error) {
-
-	logs, sub, err := _Chainreader.contract.FilterLogs(opts, "SimpleEvent")
-	if err != nil {
-		return nil, err
-	}
-	return &ChainreaderSimpleEventIterator{contract: _Chainreader.contract, event: "SimpleEvent", logs: logs, sub: sub}, nil
-}
-
-// WatchSimpleEvent is a free log subscription operation binding the contract event 0x12d199749b3f4c44df8d9386c63d725b7756ec47204f3aa0bf05ea832f89effb.
-//
-// Solidity: event SimpleEvent(uint256 value)
-func (_Chainreader *ChainreaderFilterer) WatchSimpleEvent(opts *bind.WatchOpts, sink chan<- *ChainreaderSimpleEvent) (event.Subscription, error) {
-
-	logs, sub, err := _Chainreader.contract.WatchLogs(opts, "SimpleEvent")
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-				// New log arrived, parse the event and forward to the user
-				event := new(ChainreaderSimpleEvent)
-				if err := _Chainreader.contract.UnpackLog(event, "SimpleEvent", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-// ParseSimpleEvent is a log parse operation binding the contract event 0x12d199749b3f4c44df8d9386c63d725b7756ec47204f3aa0bf05ea832f89effb.
-//
-// Solidity: event SimpleEvent(uint256 value)
-func (_Chainreader *ChainreaderFilterer) ParseSimpleEvent(log types.Log) (*ChainreaderSimpleEvent, error) {
-	event := new(ChainreaderSimpleEvent)
-	if err := _Chainreader.contract.UnpackLog(event, "SimpleEvent", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
diff --git a/core/capabilities/ccip/ccip_integration_tests/chainreader/mycontract.sol b/core/capabilities/ccip/ccip_integration_tests/chainreader/mycontract.sol
deleted file mode 100644
index 0fae1f4baa..0000000000
--- a/core/capabilities/ccip/ccip_integration_tests/chainreader/mycontract.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.18;
-
-contract SimpleContract {
-    event SimpleEvent(uint256 value);
-    uint256 public eventCount;
-    uint[] public numbers;
-
-    struct Person {
-        string name;
-        uint age;
-    }
-
-    function emitEvent() public {
-        eventCount++;
-        numbers.push(eventCount);
-        emit SimpleEvent(eventCount);
-    }
-
-    function getEventCount() public view returns (uint256) {
-        return eventCount;
-    }
-
-    function getNumbers() public view returns (uint256[] memory) {
-        return numbers;
-    }
-
-    function getPerson() public pure returns (Person memory) {
-        return Person("Dim", 18);
-    }
-}
diff --git a/core/capabilities/ccip/ccip_integration_tests/helpers.go b/core/capabilities/ccip/ccip_integration_tests/helpers.go
deleted file mode 100644
index 11c8d96800..0000000000
--- a/core/capabilities/ccip/ccip_integration_tests/helpers.go
+++ /dev/null
@@ -1,958 +0,0 @@
-package ccip_integration_tests
-
-import (
-	"bytes"
-	"encoding/hex"
-	"math/big"
-	"sort"
-	"testing"
-	"time"
-
-	"github.com/smartcontractkit/chainlink-ccip/chainconfig"
-	"github.com/smartcontractkit/chainlink-ccip/pluginconfig"
-	commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config"
-	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ccip_integration_tests/integrationhelpers"
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-
-	confighelper2 "github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3confighelper"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/maybe_revert_message_receiver"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/mock_rmn_contract"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/nonce_manager"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ocr3_config_encoder"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_proxy_contract"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/token_admin_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/weth9"
-	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/shared/generated/link_token"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-
-	chainsel "github.com/smartcontractkit/chain-selectors"
-
-	"github.com/stretchr/testify/require"
-)
-
-var (
-	homeChainID                = chainsel.GETH_TESTNET.EvmChainID
-	ccipSendRequestedTopic     = onramp.OnRampCCIPSendRequested{}.Topic()
-	commitReportAcceptedTopic  = offramp.OffRampCommitReportAccepted{}.Topic()
-	executionStateChangedTopic = offramp.OffRampExecutionStateChanged{}.Topic()
-)
-
-const (
-	CapabilityLabelledName = "ccip"
-	CapabilityVersion      = "v1.0.0"
-	NodeOperatorID         = 1
-
-	// These constants drive what is set in the plugin offchain configs.
-	FirstBlockAge                           = 8 * time.Hour
-	RemoteGasPriceBatchWriteFrequency       = 30 * time.Minute
-	BatchGasLimit                           = 6_500_000
-	RelativeBoostPerWaitHour                = 1.5
-	InflightCacheExpiry                     = 10 * time.Minute
-	RootSnoozeTime                          = 30 * time.Minute
-	BatchingStrategyID                      = 0
-	DeltaProgress                           = 30 * time.Second
-	DeltaResend                             = 10 * time.Second
-	DeltaInitial                            = 20 * time.Second
-	DeltaRound                              = 2 * time.Second
-	DeltaGrace                              = 2 * time.Second
-	DeltaCertifiedCommitRequest             = 10 * time.Second
-	DeltaStage                              = 10 * time.Second
-	Rmax                                    = 3
-	MaxDurationQuery                        = 50 * time.Millisecond
-	MaxDurationObservation                  = 5 * time.Second
-	MaxDurationShouldAcceptAttestedReport   = 10 * time.Second
-	MaxDurationShouldTransmitAcceptedReport = 10 * time.Second
-)
-
-func e18Mult(amount uint64) *big.Int {
-	return new(big.Int).Mul(uBigInt(amount), uBigInt(1e18))
-}
-
-func uBigInt(i uint64) *big.Int {
-	return new(big.Int).SetUint64(i)
-}
-
-type homeChain struct {
-	backend            *backends.SimulatedBackend
-	owner              *bind.TransactOpts
-	chainID            uint64
-	capabilityRegistry *kcr.CapabilitiesRegistry
-	ccipConfig         *ccip_config.CCIPConfig
-}
-
-type onchainUniverse struct {
-	backend            *backends.SimulatedBackend
-	owner              *bind.TransactOpts
-	chainID            uint64
-	linkToken          *link_token.LinkToken
-	weth               *weth9.WETH9
-	router             *router.Router
-	rmnProxy           *rmn_proxy_contract.RMNProxyContract
-	rmn                *mock_rmn_contract.MockRMNContract
-	onramp             *onramp.OnRamp
-	offramp            *offramp.OffRamp
-	priceRegistry      *price_registry.PriceRegistry
-	tokenAdminRegistry *token_admin_registry.TokenAdminRegistry
-	nonceManager       *nonce_manager.NonceManager
-	receiver           *maybe_revert_message_receiver.MaybeRevertMessageReceiver
-}
-
-type requestData struct {
-	destChainSelector uint64
-	receiverAddress   common.Address
-	data              []byte
-}
-
-func (u *onchainUniverse) SendCCIPRequests(t *testing.T, requestDatas []requestData) {
-	for _, reqData := range requestDatas {
-		msg := router.ClientEVM2AnyMessage{
-			Receiver:     common.LeftPadBytes(reqData.receiverAddress.Bytes(), 32),
-			Data:         reqData.data,
-			TokenAmounts: nil, // TODO: no tokens for now
-			FeeToken:     u.weth.Address(),
-			ExtraArgs:    nil, // TODO: no extra args for now, falls back to default
-		}
-		fee, err := u.router.GetFee(&bind.CallOpts{Context: testutils.Context(t)}, reqData.destChainSelector, msg)
-		require.NoError(t, err)
-		_, err = u.weth.Deposit(&bind.TransactOpts{
-			From:   u.owner.From,
-			Signer: u.owner.Signer,
-			Value:  fee,
-		})
-		require.NoError(t, err)
-		u.backend.Commit()
-		_, err = u.weth.Approve(u.owner, u.router.Address(), fee)
-		require.NoError(t, err)
-		u.backend.Commit()
-
-		t.Logf("Sending CCIP request from chain %d (selector %d) to chain selector %d",
-			u.chainID, getSelector(u.chainID), reqData.destChainSelector)
-		_, err = u.router.CcipSend(u.owner, reqData.destChainSelector, msg)
-		require.NoError(t, err)
-		u.backend.Commit()
-	}
-}
-
-type chainBase struct {
-	backend *backends.SimulatedBackend
-	owner   *bind.TransactOpts
-}
-
-// createUniverses does the following:
-// 1. Creates 1 home chain and `numChains`-1 non-home chains
-// 2. Sets up home chain with the capability registry and the CCIP config contract
-// 2. Deploys the CCIP contracts to all chains.
-// 3. Sets up the initial configurations for the contracts on all chains.
-// 4. Wires the chains together.
-//
-// Conceptually one universe is ONE chain with all the contracts deployed on it and all the dependencies initialized.
-func createUniverses(
-	t *testing.T,
-	numChains int,
-) (homeChainUni homeChain, universes map[uint64]onchainUniverse) {
-	chains := createChains(t, numChains)
-
-	homeChainBase, ok := chains[homeChainID]
-	require.True(t, ok, "home chain backend not available")
-	// Set up home chain first
-	homeChainUniverse := setupHomeChain(t, homeChainBase.owner, homeChainBase.backend)
-
-	// deploy the ccip contracts on all chains
-	universes = make(map[uint64]onchainUniverse)
-	for chainID, base := range chains {
-		owner := base.owner
-		backend := base.backend
-		// deploy the CCIP contracts
-		linkToken := deployLinkToken(t, owner, backend, chainID)
-		rmn := deployMockRMNContract(t, owner, backend, chainID)
-		rmnProxy := deployRMNProxyContract(t, owner, backend, rmn.Address(), chainID)
-		weth := deployWETHContract(t, owner, backend, chainID)
-		rout := deployRouter(t, owner, backend, weth.Address(), rmnProxy.Address(), chainID)
-		priceRegistry := deployPriceRegistry(t, owner, backend, linkToken.Address(), weth.Address(), big.NewInt(1e18), chainID)
-		tokenAdminRegistry := deployTokenAdminRegistry(t, owner, backend, chainID)
-		nonceManager := deployNonceManager(t, owner, backend, chainID)
-
-		// ======================================================================
-		//							OnRamp
-		// ======================================================================
-		onRampAddr, _, _, err := onramp.DeployOnRamp(
-			owner,
-			backend,
-			onramp.OnRampStaticConfig{
-				ChainSelector:      getSelector(chainID),
-				RmnProxy:           rmnProxy.Address(),
-				NonceManager:       nonceManager.Address(),
-				TokenAdminRegistry: tokenAdminRegistry.Address(),
-			},
-			onramp.OnRampDynamicConfig{
-				PriceRegistry: priceRegistry.Address(),
-				// `withdrawFeeTokens` onRamp function is not part of the message flow
-				// so we can set this to any address
-				FeeAggregator: testutils.NewAddress(),
-			},
-			// Destination chain configs will be set up later once we have all chains
-			[]onramp.OnRampDestChainConfigArgs{},
-		)
-		require.NoErrorf(t, err, "failed to deploy onramp on chain id %d", chainID)
-		backend.Commit()
-		onramp, err := onramp.NewOnRamp(onRampAddr, backend)
-		require.NoError(t, err)
-
-		// ======================================================================
-		//							OffRamp
-		// ======================================================================
-		offrampAddr, _, _, err := offramp.DeployOffRamp(
-			owner,
-			backend,
-			offramp.OffRampStaticConfig{
-				ChainSelector:      getSelector(chainID),
-				RmnProxy:           rmnProxy.Address(),
-				TokenAdminRegistry: tokenAdminRegistry.Address(),
-				NonceManager:       nonceManager.Address(),
-			},
-			offramp.OffRampDynamicConfig{
-				PriceRegistry: priceRegistry.Address(),
-			},
-			// Source chain configs will be set up later once we have all chains
-			[]offramp.OffRampSourceChainConfigArgs{},
-		)
-		require.NoErrorf(t, err, "failed to deploy offramp on chain id %d", chainID)
-		backend.Commit()
-		offramp, err := offramp.NewOffRamp(offrampAddr, backend)
-		require.NoError(t, err)
-
-		receiverAddress, _, _, err := maybe_revert_message_receiver.DeployMaybeRevertMessageReceiver(
-			owner,
-			backend,
-			false,
-		)
-		require.NoError(t, err, "failed to deploy MaybeRevertMessageReceiver on chain id %d", chainID)
-		backend.Commit()
-		receiver, err := maybe_revert_message_receiver.NewMaybeRevertMessageReceiver(receiverAddress, backend)
-		require.NoError(t, err)
-
-		universe := onchainUniverse{
-			backend:            backend,
-			owner:              owner,
-			chainID:            chainID,
-			linkToken:          linkToken,
-			weth:               weth,
-			router:             rout,
-			rmnProxy:           rmnProxy,
-			rmn:                rmn,
-			onramp:             onramp,
-			offramp:            offramp,
-			priceRegistry:      priceRegistry,
-			tokenAdminRegistry: tokenAdminRegistry,
-			nonceManager:       nonceManager,
-			receiver:           receiver,
-		}
-		// Set up the initial configurations for the contracts
-		setupUniverseBasics(t, universe)
-
-		universes[chainID] = universe
-	}
-
-	// Once we have all chains created and contracts deployed, we can set up the initial configurations and wire chains together
-	connectUniverses(t, universes)
-
-	// print out all contract addresses for debugging purposes
-	for chainID, uni := range universes {
-		t.Logf("Chain ID: %d\n Chain Selector: %d\n LinkToken: %s\n WETH: %s\n Router: %s\n RMNProxy: %s\n RMN: %s\n OnRamp: %s\n OffRamp: %s\n PriceRegistry: %s\n TokenAdminRegistry: %s\n NonceManager: %s\n",
-			chainID,
-			getSelector(chainID),
-			uni.linkToken.Address().Hex(),
-			uni.weth.Address().Hex(),
-			uni.router.Address().Hex(),
-			uni.rmnProxy.Address().Hex(),
-			uni.rmn.Address().Hex(),
-			uni.onramp.Address().Hex(),
-			uni.offramp.Address().Hex(),
-			uni.priceRegistry.Address().Hex(),
-			uni.tokenAdminRegistry.Address().Hex(),
-			uni.nonceManager.Address().Hex(),
-		)
-	}
-
-	// print out topic hashes of relevant events for debugging purposes
-	t.Logf("Topic hash of CommitReportAccepted: %s", commitReportAcceptedTopic.Hex())
-	t.Logf("Topic hash of ExecutionStateChanged: %s", executionStateChangedTopic.Hex())
-	t.Logf("Topic hash of CCIPSendRequested: %s", ccipSendRequestedTopic.Hex())
-
-	return homeChainUniverse, universes
-}
-
-// Creates 1 home chain and `numChains`-1 non-home chains
-func createChains(t *testing.T, numChains int) map[uint64]chainBase {
-	chains := make(map[uint64]chainBase)
-
-	homeChainOwner := testutils.MustNewSimTransactor(t)
-	homeChainBackend := backends.NewSimulatedBackend(core.GenesisAlloc{
-		homeChainOwner.From: core.GenesisAccount{
-			Balance: assets.Ether(10_000).ToInt(),
-		},
-	}, 30e6)
-	tweakChainTimestamp(t, homeChainBackend, FirstBlockAge)
-
-	chains[homeChainID] = chainBase{
-		owner:   homeChainOwner,
-		backend: homeChainBackend,
-	}
-
-	for chainID := chainsel.TEST_90000001.EvmChainID; len(chains) < numChains && chainID < chainsel.TEST_90000020.EvmChainID; chainID++ {
-		owner := testutils.MustNewSimTransactor(t)
-		backend := backends.NewSimulatedBackend(core.GenesisAlloc{
-			owner.From: core.GenesisAccount{
-				Balance: assets.Ether(10_000).ToInt(),
-			},
-		}, 30e6)
-
-		tweakChainTimestamp(t, backend, FirstBlockAge)
-
-		chains[chainID] = chainBase{
-			owner:   owner,
-			backend: backend,
-		}
-	}
-
-	return chains
-}
-
-// CCIP relies on block timestamps, but SimulatedBackend uses by default clock starting from 1970-01-01
-// This trick is used to move the clock closer to the current time. We set first block to be X hours ago.
-// Tests create plenty of transactions so this number can't be too low, every new block mined will tick the clock,
-// if you mine more than "X hours" transactions, SimulatedBackend will panic because generated timestamps will be in the future.
-func tweakChainTimestamp(t *testing.T, backend *backends.SimulatedBackend, tweak time.Duration) {
-	blockTime := time.Unix(int64(backend.Blockchain().CurrentHeader().Time), 0)
-	sinceBlockTime := time.Since(blockTime)
-	diff := sinceBlockTime - tweak
-	err := backend.AdjustTime(diff)
-	require.NoError(t, err, "unable to adjust time on simulated chain")
-	backend.Commit()
-	backend.Commit()
-}
-
-func setupHomeChain(t *testing.T, owner *bind.TransactOpts, backend *backends.SimulatedBackend) homeChain {
-	// deploy the capability registry on the home chain
-	crAddress, _, _, err := kcr.DeployCapabilitiesRegistry(owner, backend)
-	require.NoError(t, err, "failed to deploy capability registry on home chain")
-	backend.Commit()
-
-	capabilityRegistry, err := kcr.NewCapabilitiesRegistry(crAddress, backend)
-	require.NoError(t, err)
-
-	ccAddress, _, _, err := ccip_config.DeployCCIPConfig(owner, backend, crAddress)
-	require.NoError(t, err)
-	backend.Commit()
-
-	capabilityConfig, err := ccip_config.NewCCIPConfig(ccAddress, backend)
-	require.NoError(t, err)
-
-	_, err = capabilityRegistry.AddCapabilities(owner, []kcr.CapabilitiesRegistryCapability{
-		{
-			LabelledName:          CapabilityLabelledName,
-			Version:               CapabilityVersion,
-			CapabilityType:        2, // consensus. not used (?)
-			ResponseType:          0, // report. not used (?)
-			ConfigurationContract: ccAddress,
-		},
-	})
-	require.NoError(t, err, "failed to add capabilities to the capability registry")
-	backend.Commit()
-
-	// Add NodeOperator, for simplicity we'll add one NodeOperator only
-	// First NodeOperator will have NodeOperatorId = 1
-	_, err = capabilityRegistry.AddNodeOperators(owner, []kcr.CapabilitiesRegistryNodeOperator{
-		{
-			Admin: owner.From,
-			Name:  "NodeOperator",
-		},
-	})
-	require.NoError(t, err, "failed to add node operator to the capability registry")
-	backend.Commit()
-
-	return homeChain{
-		backend:            backend,
-		owner:              owner,
-		chainID:            homeChainID,
-		capabilityRegistry: capabilityRegistry,
-		ccipConfig:         capabilityConfig,
-	}
-}
-
-func sortP2PIDS(p2pIDs [][32]byte) {
-	sort.Slice(p2pIDs, func(i, j int) bool {
-		return bytes.Compare(p2pIDs[i][:], p2pIDs[j][:]) < 0
-	})
-}
-
-func (h *homeChain) AddNodes(
-	t *testing.T,
-	p2pIDs [][32]byte,
-	capabilityIDs [][32]byte,
-) {
-	// Need to sort, otherwise _checkIsValidUniqueSubset onChain will fail
-	sortP2PIDS(p2pIDs)
-	var nodeParams []kcr.CapabilitiesRegistryNodeParams
-	for _, p2pID := range p2pIDs {
-		nodeParam := kcr.CapabilitiesRegistryNodeParams{
-			NodeOperatorId:      NodeOperatorID,
-			Signer:              p2pID, // Not used in tests
-			P2pId:               p2pID,
-			HashedCapabilityIds: capabilityIDs,
-		}
-		nodeParams = append(nodeParams, nodeParam)
-	}
-	_, err := h.capabilityRegistry.AddNodes(h.owner, nodeParams)
-	require.NoError(t, err, "failed to add node operator oracles")
-	h.backend.Commit()
-}
-
-func AddChainConfig(
-	t *testing.T,
-	h homeChain,
-	chainSelector uint64,
-	p2pIDs [][32]byte,
-	f uint8,
-) ccip_config.CCIPConfigTypesChainConfigInfo {
-	// Need to sort, otherwise _checkIsValidUniqueSubset onChain will fail
-	sortP2PIDS(p2pIDs)
-	// First Add ChainConfig that includes all p2pIDs as readers
-	encodedExtraChainConfig, err := chainconfig.EncodeChainConfig(chainconfig.ChainConfig{
-		GasPriceDeviationPPB:    ccipocr3.NewBigIntFromInt64(1000),
-		DAGasPriceDeviationPPB:  ccipocr3.NewBigIntFromInt64(0),
-		FinalityDepth:           10,
-		OptimisticConfirmations: 1,
-	})
-	require.NoError(t, err)
-	chainConfig := integrationhelpers.SetupConfigInfo(chainSelector, p2pIDs, f, encodedExtraChainConfig)
-	inputConfig := []ccip_config.CCIPConfigTypesChainConfigInfo{
-		chainConfig,
-	}
-	_, err = h.ccipConfig.ApplyChainConfigUpdates(h.owner, nil, inputConfig)
-	require.NoError(t, err)
-	h.backend.Commit()
-	return chainConfig
-}
-
-func (h *homeChain) AddDON(
-	t *testing.T,
-	ccipCapabilityID [32]byte,
-	chainSelector uint64,
-	uni onchainUniverse,
-	f uint8,
-	bootstrapP2PID [32]byte,
-	p2pIDs [][32]byte,
-	oracles []confighelper2.OracleIdentityExtra,
-) {
-	// Get OCR3 Config from helper
-	var schedule []int
-	for range oracles {
-		schedule = append(schedule, 1)
-	}
-
-	tabi, err := ocr3_config_encoder.IOCR3ConfigEncoderMetaData.GetAbi()
-	require.NoError(t, err)
-
-	// Add DON on capability registry contract
-	var ocr3Configs []ocr3_config_encoder.CCIPConfigTypesOCR3Config
-	for _, pluginType := range []cctypes.PluginType{cctypes.PluginTypeCCIPCommit, cctypes.PluginTypeCCIPExec} {
-		var encodedOffchainConfig []byte
-		var err2 error
-		if pluginType == cctypes.PluginTypeCCIPCommit {
-			encodedOffchainConfig, err2 = pluginconfig.EncodeCommitOffchainConfig(pluginconfig.CommitOffchainConfig{
-				RemoteGasPriceBatchWriteFrequency: *commonconfig.MustNewDuration(RemoteGasPriceBatchWriteFrequency),
-				// TODO: implement token price writes
-				// TokenPriceBatchWriteFrequency:     *commonconfig.MustNewDuration(tokenPriceBatchWriteFrequency),
-			})
-			require.NoError(t, err2)
-		} else {
-			encodedOffchainConfig, err2 = pluginconfig.EncodeExecuteOffchainConfig(pluginconfig.ExecuteOffchainConfig{
-				BatchGasLimit:             BatchGasLimit,
-				RelativeBoostPerWaitHour:  RelativeBoostPerWaitHour,
-				MessageVisibilityInterval: *commonconfig.MustNewDuration(FirstBlockAge),
-				InflightCacheExpiry:       *commonconfig.MustNewDuration(InflightCacheExpiry),
-				RootSnoozeTime:            *commonconfig.MustNewDuration(RootSnoozeTime),
-				BatchingStrategyID:        BatchingStrategyID,
-			})
-			require.NoError(t, err2)
-		}
-		signers, transmitters, configF, _, offchainConfigVersion, offchainConfig, err2 := ocr3confighelper.ContractSetConfigArgsForTests(
-			DeltaProgress,
-			DeltaResend,
-			DeltaInitial,
-			DeltaRound,
-			DeltaGrace,
-			DeltaCertifiedCommitRequest,
-			DeltaStage,
-			Rmax,
-			schedule,
-			oracles,
-			encodedOffchainConfig,
-			MaxDurationQuery,
-			MaxDurationObservation,
-			MaxDurationShouldAcceptAttestedReport,
-			MaxDurationShouldTransmitAcceptedReport,
-			int(f),
-			[]byte{}, // empty OnChainConfig
-		)
-		require.NoError(t, err2, "failed to create contract config")
-
-		signersBytes := make([][]byte, len(signers))
-		for i, signer := range signers {
-			signersBytes[i] = signer
-		}
-
-		transmittersBytes := make([][]byte, len(transmitters))
-		for i, transmitter := range transmitters {
-			// anotherErr because linting doesn't want to shadow err
-			parsed, anotherErr := common.ParseHexOrString(string(transmitter))
-			require.NoError(t, anotherErr)
-			transmittersBytes[i] = parsed
-		}
-
-		ocr3Configs = append(ocr3Configs, ocr3_config_encoder.CCIPConfigTypesOCR3Config{
-			PluginType:            uint8(pluginType),
-			ChainSelector:         chainSelector,
-			F:                     configF,
-			OffchainConfigVersion: offchainConfigVersion,
-			OfframpAddress:        uni.offramp.Address().Bytes(),
-			BootstrapP2PIds:       [][32]byte{bootstrapP2PID},
-			P2pIds:                p2pIDs,
-			Signers:               signersBytes,
-			Transmitters:          transmittersBytes,
-			OffchainConfig:        offchainConfig,
-		})
-	}
-
-	encodedCall, err := tabi.Pack("exposeOCR3Config", ocr3Configs)
-	require.NoError(t, err)
-
-	// Trim first four bytes to remove function selector.
-	encodedConfigs := encodedCall[4:]
-
-	// commit so that we have an empty block to filter events from
-	h.backend.Commit()
-
-	_, err = h.capabilityRegistry.AddDON(h.owner, p2pIDs, []kcr.CapabilitiesRegistryCapabilityConfiguration{
-		{
-			CapabilityId: ccipCapabilityID,
-			Config:       encodedConfigs,
-		},
-	}, false, false, f)
-	require.NoError(t, err)
-	h.backend.Commit()
-
-	endBlock := h.backend.Blockchain().CurrentBlock().Number.Uint64()
-	iter, err := h.capabilityRegistry.FilterConfigSet(&bind.FilterOpts{
-		Start: h.backend.Blockchain().CurrentBlock().Number.Uint64() - 1,
-		End:   &endBlock,
-	})
-	require.NoError(t, err, "failed to filter config set events")
-	var donID uint32
-	for iter.Next() {
-		donID = iter.Event.DonId
-		break
-	}
-	require.NotZero(t, donID, "failed to get donID from config set event")
-
-	var signerAddresses []common.Address
-	for _, oracle := range oracles {
-		signerAddresses = append(signerAddresses, common.BytesToAddress(oracle.OnchainPublicKey))
-	}
-
-	var transmitterAddresses []common.Address
-	for _, oracle := range oracles {
-		transmitterAddresses = append(transmitterAddresses, common.HexToAddress(string(oracle.TransmitAccount)))
-	}
-
-	// get the config digest from the ccip config contract and set config on the offramp.
-	var offrampOCR3Configs []offramp.MultiOCR3BaseOCRConfigArgs
-	for _, pluginType := range []cctypes.PluginType{cctypes.PluginTypeCCIPCommit, cctypes.PluginTypeCCIPExec} {
-		ocrConfig, err1 := h.ccipConfig.GetOCRConfig(&bind.CallOpts{
-			Context: testutils.Context(t),
-		}, donID, uint8(pluginType))
-		require.NoError(t, err1, "failed to get OCR3 config from ccip config contract")
-		require.Len(t, ocrConfig, 1, "expected exactly one OCR3 config")
-		offrampOCR3Configs = append(offrampOCR3Configs, offramp.MultiOCR3BaseOCRConfigArgs{
-			ConfigDigest:                   ocrConfig[0].ConfigDigest,
-			OcrPluginType:                  uint8(pluginType),
-			F:                              f,
-			IsSignatureVerificationEnabled: pluginType == cctypes.PluginTypeCCIPCommit,
-			Signers:                        signerAddresses,
-			Transmitters:                   transmitterAddresses,
-		})
-	}
-
-	uni.backend.Commit()
-
-	_, err = uni.offramp.SetOCR3Configs(uni.owner, offrampOCR3Configs)
-	require.NoError(t, err, "failed to set ocr3 configs on offramp")
-	uni.backend.Commit()
-
-	for _, pluginType := range []cctypes.PluginType{cctypes.PluginTypeCCIPCommit, cctypes.PluginTypeCCIPExec} {
-		ocrConfig, err := uni.offramp.LatestConfigDetails(&bind.CallOpts{
-			Context: testutils.Context(t),
-		}, uint8(pluginType))
-		require.NoError(t, err, "failed to get latest commit OCR3 config")
-		require.Equalf(t, offrampOCR3Configs[pluginType].ConfigDigest, ocrConfig.ConfigInfo.ConfigDigest, "%s OCR3 config digest mismatch", pluginType.String())
-		require.Equalf(t, offrampOCR3Configs[pluginType].F, ocrConfig.ConfigInfo.F, "%s OCR3 config F mismatch", pluginType.String())
-		require.Equalf(t, offrampOCR3Configs[pluginType].IsSignatureVerificationEnabled, ocrConfig.ConfigInfo.IsSignatureVerificationEnabled, "%s OCR3 config signature verification mismatch", pluginType.String())
-		if pluginType == cctypes.PluginTypeCCIPCommit {
-			// only commit will set signers, exec doesn't need them.
-			require.Equalf(t, offrampOCR3Configs[pluginType].Signers, ocrConfig.Signers, "%s OCR3 config signers mismatch", pluginType.String())
-		}
-		require.Equalf(t, offrampOCR3Configs[pluginType].Transmitters, ocrConfig.Transmitters, "%s OCR3 config transmitters mismatch", pluginType.String())
-	}
-
-	t.Logf("set ocr3 config on the offramp, signers: %+v, transmitters: %+v", signerAddresses, transmitterAddresses)
-}
-
-func connectUniverses(
-	t *testing.T,
-	universes map[uint64]onchainUniverse,
-) {
-	for _, uni := range universes {
-		wireRouter(t, uni, universes)
-		wirePriceRegistry(t, uni, universes)
-		wireOnRamp(t, uni, universes)
-		wireOffRamp(t, uni, universes)
-		initRemoteChainsGasPrices(t, uni, universes)
-	}
-}
-
-// setupUniverseBasics sets up the initial configurations for the CCIP contracts on a single chain.
-// 1. Mint 1000 LINK to the owner
-// 2. Set the price registry with local token prices
-// 3. Authorize the onRamp and offRamp on the nonce manager
-func setupUniverseBasics(t *testing.T, uni onchainUniverse) {
-	// =============================================================================
-	//			Universe specific  updates/configs
-	//		These updates are specific to each universe and are set up here
-	//      These updates don't depend on other chains
-	// =============================================================================
-	owner := uni.owner
-	// =============================================================================
-	//							Mint 1000 LINK to owner
-	// =============================================================================
-	_, err := uni.linkToken.GrantMintRole(owner, owner.From)
-	require.NoError(t, err)
-	_, err = uni.linkToken.Mint(owner, owner.From, e18Mult(1000))
-	require.NoError(t, err)
-	uni.backend.Commit()
-
-	// =============================================================================
-	//						Price updates for tokens
-	//			These are the prices of the fee tokens of local chain in USD
-	// =============================================================================
-	tokenPriceUpdates := []price_registry.InternalTokenPriceUpdate{
-		{
-			SourceToken: uni.linkToken.Address(),
-			UsdPerToken: e18Mult(20),
-		},
-		{
-			SourceToken: uni.weth.Address(),
-			UsdPerToken: e18Mult(4000),
-		},
-	}
-	_, err = uni.priceRegistry.UpdatePrices(owner, price_registry.InternalPriceUpdates{
-		TokenPriceUpdates: tokenPriceUpdates,
-	})
-	require.NoErrorf(t, err, "failed to update prices in price registry on chain id %d", uni.chainID)
-	uni.backend.Commit()
-
-	_, err = uni.priceRegistry.ApplyAuthorizedCallerUpdates(owner, price_registry.AuthorizedCallersAuthorizedCallerArgs{
-		AddedCallers: []common.Address{
-			uni.offramp.Address(),
-		},
-	})
-	require.NoError(t, err, "failed to authorize offramp on price registry")
-	uni.backend.Commit()
-
-	// =============================================================================
-	//						Authorize OnRamp & OffRamp on NonceManager
-	//	Otherwise the onramp will not be able to call the nonceManager to get next Nonce
-	// =============================================================================
-	authorizedCallersAuthorizedCallerArgs := nonce_manager.AuthorizedCallersAuthorizedCallerArgs{
-		AddedCallers: []common.Address{
-			uni.onramp.Address(),
-			uni.offramp.Address(),
-		},
-	}
-	_, err = uni.nonceManager.ApplyAuthorizedCallerUpdates(owner, authorizedCallersAuthorizedCallerArgs)
-	require.NoError(t, err)
-	uni.backend.Commit()
-}
-
-// As we can't change router contract. The contract was expecting onRamp and offRamp per lane and not per chain
-// In the new architecture we have only one onRamp and one offRamp per chain.
-// hence we add the mapping for all remote chains to the onRamp/offRamp contract of the local chain
-func wireRouter(t *testing.T, uni onchainUniverse, universes map[uint64]onchainUniverse) {
-	owner := uni.owner
-	var (
-		routerOnrampUpdates  []router.RouterOnRamp
-		routerOfframpUpdates []router.RouterOffRamp
-	)
-	for remoteChainID := range universes {
-		if remoteChainID == uni.chainID {
-			continue
-		}
-		routerOnrampUpdates = append(routerOnrampUpdates, router.RouterOnRamp{
-			DestChainSelector: getSelector(remoteChainID),
-			OnRamp:            uni.onramp.Address(),
-		})
-		routerOfframpUpdates = append(routerOfframpUpdates, router.RouterOffRamp{
-			SourceChainSelector: getSelector(remoteChainID),
-			OffRamp:             uni.offramp.Address(),
-		})
-	}
-	_, err := uni.router.ApplyRampUpdates(owner, routerOnrampUpdates, []router.RouterOffRamp{}, routerOfframpUpdates)
-	require.NoErrorf(t, err, "failed to apply ramp updates on router on chain id %d", uni.chainID)
-	uni.backend.Commit()
-}
-
-// Setting OnRampDestChainConfigs
-func wirePriceRegistry(t *testing.T, uni onchainUniverse, universes map[uint64]onchainUniverse) {
-	owner := uni.owner
-	var priceRegistryDestChainConfigArgs []price_registry.PriceRegistryDestChainConfigArgs
-	for remoteChainID := range universes {
-		if remoteChainID == uni.chainID {
-			continue
-		}
-		priceRegistryDestChainConfigArgs = append(priceRegistryDestChainConfigArgs, price_registry.PriceRegistryDestChainConfigArgs{
-			DestChainSelector: getSelector(remoteChainID),
-			DestChainConfig:   defaultPriceRegistryDestChainConfig(t),
-		})
-	}
-	_, err := uni.priceRegistry.ApplyDestChainConfigUpdates(owner, priceRegistryDestChainConfigArgs)
-	require.NoErrorf(t, err, "failed to apply dest chain config updates on price registry on chain id %d", uni.chainID)
-	uni.backend.Commit()
-}
-
-// Setting OnRampDestChainConfigs
-func wireOnRamp(t *testing.T, uni onchainUniverse, universes map[uint64]onchainUniverse) {
-	owner := uni.owner
-	var onrampSourceChainConfigArgs []onramp.OnRampDestChainConfigArgs
-	for remoteChainID := range universes {
-		if remoteChainID == uni.chainID {
-			continue
-		}
-		onrampSourceChainConfigArgs = append(onrampSourceChainConfigArgs, onramp.OnRampDestChainConfigArgs{
-			DestChainSelector: getSelector(remoteChainID),
-			Router:            uni.router.Address(),
-		})
-	}
-	_, err := uni.onramp.ApplyDestChainConfigUpdates(owner, onrampSourceChainConfigArgs)
-	require.NoErrorf(t, err, "failed to apply dest chain config updates on onramp with chain id %d", uni.chainID)
-	uni.backend.Commit()
-}
-
-// Setting OffRampSourceChainConfigs
-func wireOffRamp(t *testing.T, uni onchainUniverse, universes map[uint64]onchainUniverse) {
-	owner := uni.owner
-	var offrampSourceChainConfigArgs []offramp.OffRampSourceChainConfigArgs
-	for remoteChainID, remoteUniverse := range universes {
-		if remoteChainID == uni.chainID {
-			continue
-		}
-		offrampSourceChainConfigArgs = append(offrampSourceChainConfigArgs, offramp.OffRampSourceChainConfigArgs{
-			SourceChainSelector: getSelector(remoteChainID),
-			IsEnabled:           true,
-			Router:              uni.router.Address(),
-			OnRamp:              remoteUniverse.onramp.Address().Bytes(),
-		})
-	}
-	_, err := uni.offramp.ApplySourceChainConfigUpdates(owner, offrampSourceChainConfigArgs)
-	require.NoErrorf(t, err, "failed to apply source chain config updates on offramp on chain id %d", uni.chainID)
-	uni.backend.Commit()
-	for remoteChainID, remoteUniverse := range universes {
-		if remoteChainID == uni.chainID {
-			continue
-		}
-		sourceCfg, err2 := uni.offramp.GetSourceChainConfig(&bind.CallOpts{}, getSelector(remoteChainID))
-		require.NoError(t, err2)
-		require.True(t, sourceCfg.IsEnabled, "source chain config should be enabled")
-		require.Equal(t, remoteUniverse.onramp.Address(), common.BytesToAddress(sourceCfg.OnRamp), "source chain config onRamp address mismatch")
-	}
-}
-
-func getSelector(chainID uint64) uint64 {
-	selector, err := chainsel.SelectorFromChainId(chainID)
-	if err != nil {
-		panic(err)
-	}
-	return selector
-}
-
-// initRemoteChainsGasPrices sets the gas prices for all chains except the local chain in the local price registry
-func initRemoteChainsGasPrices(t *testing.T, uni onchainUniverse, universes map[uint64]onchainUniverse) {
-	var gasPriceUpdates []price_registry.InternalGasPriceUpdate
-	for remoteChainID := range universes {
-		if remoteChainID == uni.chainID {
-			continue
-		}
-		gasPriceUpdates = append(gasPriceUpdates,
-			price_registry.InternalGasPriceUpdate{
-				DestChainSelector: getSelector(remoteChainID),
-				UsdPerUnitGas:     big.NewInt(2e12),
-			},
-		)
-	}
-	_, err := uni.priceRegistry.UpdatePrices(uni.owner, price_registry.InternalPriceUpdates{
-		GasPriceUpdates: gasPriceUpdates,
-	})
-	require.NoError(t, err)
-}
-
-func defaultPriceRegistryDestChainConfig(t *testing.T) price_registry.PriceRegistryDestChainConfig {
-	// https://github.com/smartcontractkit/ccip/blob/c4856b64bd766f1ddbaf5d13b42d3c4b12efde3a/contracts/src/v0.8/ccip/libraries/Internal.sol#L337-L337
-	/*
-		```Solidity
-			// bytes4(keccak256("CCIP ChainFamilySelector EVM"))
-			bytes4 public constant CHAIN_FAMILY_SELECTOR_EVM = 0x2812d52c;
-		```
-	*/
-	evmFamilySelector, err := hex.DecodeString("2812d52c")
-	require.NoError(t, err)
-	return price_registry.PriceRegistryDestChainConfig{
-		IsEnabled:                         true,
-		MaxNumberOfTokensPerMsg:           10,
-		MaxDataBytes:                      256,
-		MaxPerMsgGasLimit:                 3_000_000,
-		DestGasOverhead:                   50_000,
-		DefaultTokenFeeUSDCents:           1,
-		DestGasPerPayloadByte:             10,
-		DestDataAvailabilityOverheadGas:   0,
-		DestGasPerDataAvailabilityByte:    100,
-		DestDataAvailabilityMultiplierBps: 1,
-		DefaultTokenDestGasOverhead:       125_000,
-		DefaultTokenDestBytesOverhead:     32,
-		DefaultTxGasLimit:                 200_000,
-		GasMultiplierWeiPerEth:            1,
-		NetworkFeeUSDCents:                1,
-		ChainFamilySelector:               [4]byte(evmFamilySelector),
-	}
-}
-
-func deployLinkToken(t *testing.T, owner *bind.TransactOpts, backend *backends.SimulatedBackend, chainID uint64) *link_token.LinkToken {
-	linkAddr, _, _, err := link_token.DeployLinkToken(owner, backend)
-	require.NoErrorf(t, err, "failed to deploy link token on chain id %d", chainID)
-	backend.Commit()
-	linkToken, err := link_token.NewLinkToken(linkAddr, backend)
-	require.NoError(t, err)
-	return linkToken
-}
-
-func deployMockRMNContract(t *testing.T, owner *bind.TransactOpts, backend *backends.SimulatedBackend, chainID uint64) *mock_rmn_contract.MockRMNContract {
-	rmnAddr, _, _, err := mock_rmn_contract.DeployMockRMNContract(owner, backend)
-	require.NoErrorf(t, err, "failed to deploy mock arm on chain id %d", chainID)
-	backend.Commit()
-	rmn, err := mock_rmn_contract.NewMockRMNContract(rmnAddr, backend)
-	require.NoError(t, err)
-	return rmn
-}
-
-func deployRMNProxyContract(t *testing.T, owner *bind.TransactOpts, backend *backends.SimulatedBackend, rmnAddr common.Address, chainID uint64) *rmn_proxy_contract.RMNProxyContract {
-	rmnProxyAddr, _, _, err := rmn_proxy_contract.DeployRMNProxyContract(owner, backend, rmnAddr)
-	require.NoErrorf(t, err, "failed to deploy arm proxy on chain id %d", chainID)
-	backend.Commit()
-	rmnProxy, err := rmn_proxy_contract.NewRMNProxyContract(rmnProxyAddr, backend)
-	require.NoError(t, err)
-	return rmnProxy
-}
-
-func deployWETHContract(t *testing.T, owner *bind.TransactOpts, backend *backends.SimulatedBackend, chainID uint64) *weth9.WETH9 {
-	wethAddr, _, _, err := weth9.DeployWETH9(owner, backend)
-	require.NoErrorf(t, err, "failed to deploy weth contract on chain id %d", chainID)
-	backend.Commit()
-	weth, err := weth9.NewWETH9(wethAddr, backend)
-	require.NoError(t, err)
-	return weth
-}
-
-func deployRouter(t *testing.T, owner *bind.TransactOpts, backend *backends.SimulatedBackend, wethAddr, rmnProxyAddr common.Address, chainID uint64) *router.Router {
-	routerAddr, _, _, err := router.DeployRouter(owner, backend, wethAddr, rmnProxyAddr)
-	require.NoErrorf(t, err, "failed to deploy router on chain id %d", chainID)
-	backend.Commit()
-	rout, err := router.NewRouter(routerAddr, backend)
-	require.NoError(t, err)
-	return rout
-}
-
-func deployPriceRegistry(
-	t *testing.T,
-	owner *bind.TransactOpts,
-	backend *backends.SimulatedBackend,
-	linkAddr,
-	wethAddr common.Address,
-	maxFeeJuelsPerMsg *big.Int,
-	chainID uint64,
-) *price_registry.PriceRegistry {
-	priceRegistryAddr, _, _, err := price_registry.DeployPriceRegistry(
-		owner,
-		backend,
-		price_registry.PriceRegistryStaticConfig{
-			MaxFeeJuelsPerMsg:  maxFeeJuelsPerMsg,
-			LinkToken:          linkAddr,
-			StalenessThreshold: 24 * 60 * 60, // 24 hours
-		},
-		[]common.Address{
-			owner.From, // owner can update prices in this test
-		}, // price updaters, will be set to offramp later
-		[]common.Address{linkAddr, wethAddr}, // fee tokens
-		// empty for now, need to fill in when testing token transfers
-		[]price_registry.PriceRegistryTokenPriceFeedUpdate{},
-		// empty for now, need to fill in when testing token transfers
-		[]price_registry.PriceRegistryTokenTransferFeeConfigArgs{},
-		[]price_registry.PriceRegistryPremiumMultiplierWeiPerEthArgs{
-			{
-				PremiumMultiplierWeiPerEth: 9e17, // 0.9 ETH
-				Token:                      linkAddr,
-			},
-			{
-				PremiumMultiplierWeiPerEth: 1e18,
-				Token:                      wethAddr,
-			},
-		},
-		// Destination chain configs will be set up later once we have all chains
-		[]price_registry.PriceRegistryDestChainConfigArgs{},
-	)
-	require.NoErrorf(t, err, "failed to deploy price registry on chain id %d", chainID)
-	backend.Commit()
-	priceRegistry, err := price_registry.NewPriceRegistry(priceRegistryAddr, backend)
-	require.NoError(t, err)
-	return priceRegistry
-}
-
-func deployTokenAdminRegistry(t *testing.T, owner *bind.TransactOpts, backend *backends.SimulatedBackend, chainID uint64) *token_admin_registry.TokenAdminRegistry {
-	tarAddr, _, _, err := token_admin_registry.DeployTokenAdminRegistry(owner, backend)
-	require.NoErrorf(t, err, "failed to deploy token admin registry on chain id %d", chainID)
-	backend.Commit()
-	tokenAdminRegistry, err := token_admin_registry.NewTokenAdminRegistry(tarAddr, backend)
-	require.NoError(t, err)
-	return tokenAdminRegistry
-}
-
-func deployNonceManager(t *testing.T, owner *bind.TransactOpts, backend *backends.SimulatedBackend, chainID uint64) *nonce_manager.NonceManager {
-	nonceManagerAddr, _, _, err := nonce_manager.DeployNonceManager(owner, backend, []common.Address{owner.From})
-	require.NoErrorf(t, err, "failed to deploy nonce_manager on chain id %d", chainID)
-	backend.Commit()
-	nonceManager, err := nonce_manager.NewNonceManager(nonceManagerAddr, backend)
-	require.NoError(t, err)
-	return nonceManager
-}
diff --git a/core/capabilities/ccip/ccip_integration_tests/home_chain_test.go b/core/capabilities/ccip/ccip_integration_tests/home_chain_test.go
deleted file mode 100644
index c8b261eba1..0000000000
--- a/core/capabilities/ccip/ccip_integration_tests/home_chain_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package ccip_integration_tests
-
-import (
-	"math/big"
-	"testing"
-	"time"
-
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ccip_integration_tests/integrationhelpers"
-
-	mapset "github.com/deckarep/golang-set/v2"
-	"github.com/onsi/gomega"
-
-	libocrtypes "github.com/smartcontractkit/libocr/ragep2p/types"
-
-	"github.com/smartcontractkit/chainlink-ccip/chainconfig"
-	ccipreader "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-
-	"github.com/stretchr/testify/require"
-
-	capcfg "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-)
-
-func TestHomeChainReader(t *testing.T) {
-	ctx := testutils.Context(t)
-	lggr := logger.TestLogger(t)
-	uni := integrationhelpers.NewTestUniverse(ctx, t, lggr)
-	// We need 3*f + 1 p2pIDs to have enough nodes to bootstrap
-	var arr []int64
-	n := int(integrationhelpers.FChainA*3 + 1)
-	for i := 0; i <= n; i++ {
-		arr = append(arr, int64(i))
-	}
-	p2pIDs := integrationhelpers.P2pIDsFromInts(arr)
-	uni.AddCapability(p2pIDs)
-
-	//==============================Apply configs to Capability Contract=================================
-	encodedChainConfig, err := chainconfig.EncodeChainConfig(chainconfig.ChainConfig{
-		GasPriceDeviationPPB:    cciptypes.NewBigIntFromInt64(1000),
-		DAGasPriceDeviationPPB:  cciptypes.NewBigIntFromInt64(1_000_000),
-		FinalityDepth:           -1,
-		OptimisticConfirmations: 1,
-	})
-	require.NoError(t, err)
-	inputConfig := []capcfg.CCIPConfigTypesChainConfigInfo{
-		integrationhelpers.SetupConfigInfo(integrationhelpers.ChainA, p2pIDs, integrationhelpers.FChainA, encodedChainConfig),
-		integrationhelpers.SetupConfigInfo(integrationhelpers.ChainB, p2pIDs[1:], integrationhelpers.FChainB, encodedChainConfig),
-		integrationhelpers.SetupConfigInfo(integrationhelpers.ChainC, p2pIDs[2:], integrationhelpers.FChainC, encodedChainConfig),
-	}
-	_, err = uni.CcipCfg.ApplyChainConfigUpdates(uni.Transactor, nil, inputConfig)
-	require.NoError(t, err)
-	uni.Backend.Commit()
-	chainConfigInfos, err := uni.CcipCfg.GetAllChainConfigs(nil, big.NewInt(0), big.NewInt(100))
-	require.NoError(t, err)
-	require.Len(t, chainConfigInfos, len(inputConfig))
-
-	// Wait for the home chain reader to read the expected amount of chain configs.
-	gomega.NewWithT(t).Eventually(func() bool {
-		configs, _ := uni.HomeChainReader.GetAllChainConfigs()
-		return len(configs) == len(inputConfig)
-	}, testutils.WaitTimeout(t), 1*time.Second).Should(gomega.BeTrue())
-
-	t.Logf("homchain reader is ready")
-
-	//================================Test HomeChain Reader===============================
-	expectedChainConfigs := map[cciptypes.ChainSelector]ccipreader.ChainConfig{}
-	for _, c := range inputConfig {
-		expectedChainConfigs[cciptypes.ChainSelector(c.ChainSelector)] = ccipreader.ChainConfig{
-			FChain:         int(c.ChainConfig.FChain),
-			SupportedNodes: toPeerIDs(c.ChainConfig.Readers),
-			Config:         mustDecodeChainConfig(t, c.ChainConfig.Config),
-		}
-	}
-
-	configs, err := uni.HomeChainReader.GetAllChainConfigs()
-	require.NoError(t, err)
-
-	require.Equal(t, expectedChainConfigs, configs)
-
-	// Remove chain C from the chain configs and expect the home chain reader to
-	// update its state accordingly.
-	_, err = uni.CcipCfg.ApplyChainConfigUpdates(uni.Transactor, []uint64{integrationhelpers.ChainC}, nil)
-	require.NoError(t, err)
-	uni.Backend.Commit()
-
-	// Wait for the home chain reader to read the expected amount of chain configs.
-	gomega.NewWithT(t).Eventually(func() bool {
-		chainConfigs, _ := uni.HomeChainReader.GetAllChainConfigs()
-		return len(chainConfigs) == len(inputConfig)-1
-	}, testutils.WaitTimeout(t), 1*time.Second).Should(gomega.BeTrue())
-	configs, err = uni.HomeChainReader.GetAllChainConfigs()
-	require.NoError(t, err)
-
-	delete(expectedChainConfigs, cciptypes.ChainSelector(integrationhelpers.ChainC))
-	require.Equal(t, expectedChainConfigs, configs)
-}
-
-func toPeerIDs(readers [][32]byte) mapset.Set[libocrtypes.PeerID] {
-	peerIDs := mapset.NewSet[libocrtypes.PeerID]()
-	for _, r := range readers {
-		peerIDs.Add(r)
-	}
-	return peerIDs
-}
-
-func mustDecodeChainConfig(t *testing.T, encodedChainConfig []byte) chainconfig.ChainConfig {
-	chainConfig, err := chainconfig.DecodeChainConfig(encodedChainConfig)
-	require.NoError(t, err)
-	return chainConfig
-}
diff --git a/core/capabilities/ccip/ccip_integration_tests/integrationhelpers/integration_helpers.go b/core/capabilities/ccip/ccip_integration_tests/integrationhelpers/integration_helpers.go
deleted file mode 100644
index 3009ecf222..0000000000
--- a/core/capabilities/ccip/ccip_integration_tests/integrationhelpers/integration_helpers.go
+++ /dev/null
@@ -1,305 +0,0 @@
-package integrationhelpers
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"math/big"
-	"sort"
-	"testing"
-	"time"
-
-	configsevm "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm"
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-
-	"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
-	ccipreader "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ocr3_config_encoder"
-	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/keys/p2pkey"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/types"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
-)
-
-const chainID = 1337
-
-func NewReader(
-	t *testing.T,
-	logPoller logpoller.LogPoller,
-	headTracker logpoller.HeadTracker,
-	client client.Client,
-	address common.Address,
-	chainReaderConfig evmrelaytypes.ChainReaderConfig,
-) types.ContractReader {
-	cr, err := evm.NewChainReaderService(testutils.Context(t), logger.TestLogger(t), logPoller, headTracker, client, chainReaderConfig)
-	require.NoError(t, err)
-	err = cr.Bind(testutils.Context(t), []types.BoundContract{
-		{
-			Address: address.String(),
-			Name:    consts.ContractNameCCIPConfig,
-		},
-	})
-	require.NoError(t, err)
-	require.NoError(t, cr.Start(testutils.Context(t)))
-	for {
-		if err := cr.Ready(); err == nil {
-			break
-		}
-	}
-
-	return cr
-}
-
-const (
-	ChainA  uint64 = 1
-	FChainA uint8  = 1
-
-	ChainB  uint64 = 2
-	FChainB uint8  = 2
-
-	ChainC  uint64 = 3
-	FChainC uint8  = 3
-
-	CcipCapabilityLabelledName = "ccip"
-	CcipCapabilityVersion      = "v1.0"
-)
-
-type TestUniverse struct {
-	Transactor      *bind.TransactOpts
-	Backend         *backends.SimulatedBackend
-	CapReg          *kcr.CapabilitiesRegistry
-	CcipCfg         *ccip_config.CCIPConfig
-	TestingT        *testing.T
-	LogPoller       logpoller.LogPoller
-	HeadTracker     logpoller.HeadTracker
-	SimClient       client.Client
-	HomeChainReader ccipreader.HomeChain
-}
-
-func NewTestUniverse(ctx context.Context, t *testing.T, lggr logger.Logger) TestUniverse {
-	transactor := testutils.MustNewSimTransactor(t)
-	backend := backends.NewSimulatedBackend(core.GenesisAlloc{
-		transactor.From: {Balance: assets.Ether(1000).ToInt()},
-	}, 30e6)
-
-	crAddress, _, _, err := kcr.DeployCapabilitiesRegistry(transactor, backend)
-	require.NoError(t, err)
-	backend.Commit()
-
-	capReg, err := kcr.NewCapabilitiesRegistry(crAddress, backend)
-	require.NoError(t, err)
-
-	ccAddress, _, _, err := ccip_config.DeployCCIPConfig(transactor, backend, crAddress)
-	require.NoError(t, err)
-	backend.Commit()
-
-	cc, err := ccip_config.NewCCIPConfig(ccAddress, backend)
-	require.NoError(t, err)
-
-	db := pgtest.NewSqlxDB(t)
-	lpOpts := logpoller.Opts{
-		PollPeriod:               time.Millisecond,
-		FinalityDepth:            0,
-		BackfillBatchSize:        10,
-		RpcBatchSize:             10,
-		KeepFinalizedBlocksDepth: 100000,
-	}
-	cl := client.NewSimulatedBackendClient(t, backend, big.NewInt(chainID))
-	headTracker := headtracker.NewSimulatedHeadTracker(cl, lpOpts.UseFinalityTag, lpOpts.FinalityDepth)
-	if lpOpts.PollPeriod == 0 {
-		lpOpts.PollPeriod = 1 * time.Hour
-	}
-	lp := logpoller.NewLogPoller(logpoller.NewORM(big.NewInt(chainID), db, lggr), cl, logger.NullLogger, headTracker, lpOpts)
-	require.NoError(t, lp.Start(ctx))
-	t.Cleanup(func() { require.NoError(t, lp.Close()) })
-
-	hcr := NewHomeChainReader(t, lp, headTracker, cl, ccAddress)
-	return TestUniverse{
-		Transactor:      transactor,
-		Backend:         backend,
-		CapReg:          capReg,
-		CcipCfg:         cc,
-		TestingT:        t,
-		SimClient:       cl,
-		LogPoller:       lp,
-		HeadTracker:     headTracker,
-		HomeChainReader: hcr,
-	}
-}
-
-func (t TestUniverse) NewContractReader(ctx context.Context, cfg []byte) (types.ContractReader, error) {
-	var config evmrelaytypes.ChainReaderConfig
-	err := json.Unmarshal(cfg, &config)
-	require.NoError(t.TestingT, err)
-	return evm.NewChainReaderService(ctx, logger.TestLogger(t.TestingT), t.LogPoller, t.HeadTracker, t.SimClient, config)
-}
-
-func P2pIDsFromInts(ints []int64) [][32]byte {
-	var p2pIDs [][32]byte
-	for _, i := range ints {
-		p2pID := p2pkey.MustNewV2XXXTestingOnly(big.NewInt(i)).PeerID()
-		p2pIDs = append(p2pIDs, p2pID)
-	}
-	sort.Slice(p2pIDs, func(i, j int) bool {
-		for k := 0; k < 32; k++ {
-			if p2pIDs[i][k] < p2pIDs[j][k] {
-				return true
-			} else if p2pIDs[i][k] > p2pIDs[j][k] {
-				return false
-			}
-		}
-		return false
-	})
-	return p2pIDs
-}
-
-func (t *TestUniverse) AddCapability(p2pIDs [][32]byte) {
-	_, err := t.CapReg.AddCapabilities(t.Transactor, []kcr.CapabilitiesRegistryCapability{
-		{
-			LabelledName:          CcipCapabilityLabelledName,
-			Version:               CcipCapabilityVersion,
-			CapabilityType:        0,
-			ResponseType:          0,
-			ConfigurationContract: t.CcipCfg.Address(),
-		},
-	})
-	require.NoError(t.TestingT, err, "failed to add capability to registry")
-	t.Backend.Commit()
-
-	ccipCapabilityID, err := t.CapReg.GetHashedCapabilityId(nil, CcipCapabilityLabelledName, CcipCapabilityVersion)
-	require.NoError(t.TestingT, err)
-
-	for i := 0; i < len(p2pIDs); i++ {
-		_, err = t.CapReg.AddNodeOperators(t.Transactor, []kcr.CapabilitiesRegistryNodeOperator{
-			{
-				Admin: t.Transactor.From,
-				Name:  fmt.Sprintf("nop-%d", i),
-			},
-		})
-		require.NoError(t.TestingT, err)
-		t.Backend.Commit()
-
-		// get the node operator id from the event
-		it, err := t.CapReg.FilterNodeOperatorAdded(nil, nil, nil)
-		require.NoError(t.TestingT, err)
-		var nodeOperatorID uint32
-		for it.Next() {
-			if it.Event.Name == fmt.Sprintf("nop-%d", i) {
-				nodeOperatorID = it.Event.NodeOperatorId
-				break
-			}
-		}
-		require.NotZero(t.TestingT, nodeOperatorID)
-
-		_, err = t.CapReg.AddNodes(t.Transactor, []kcr.CapabilitiesRegistryNodeParams{
-			{
-				NodeOperatorId:      nodeOperatorID,
-				Signer:              testutils.Random32Byte(),
-				P2pId:               p2pIDs[i],
-				HashedCapabilityIds: [][32]byte{ccipCapabilityID},
-			},
-		})
-		require.NoError(t.TestingT, err)
-		t.Backend.Commit()
-
-		// verify that the node was added successfully
-		nodeInfo, err := t.CapReg.GetNode(nil, p2pIDs[i])
-		require.NoError(t.TestingT, err)
-
-		require.Equal(t.TestingT, nodeOperatorID, nodeInfo.NodeOperatorId)
-		require.Equal(t.TestingT, p2pIDs[i][:], nodeInfo.P2pId[:])
-	}
-}
-
-func NewHomeChainReader(t *testing.T, logPoller logpoller.LogPoller, headTracker logpoller.HeadTracker, client client.Client, ccAddress common.Address) ccipreader.HomeChain {
-	cr := NewReader(t, logPoller, headTracker, client, ccAddress, configsevm.HomeChainReaderConfigRaw())
-
-	hcr := ccipreader.NewHomeChainReader(cr, logger.TestLogger(t), 500*time.Millisecond, types.BoundContract{
-		Address: ccAddress.String(),
-		Name:    consts.ContractNameCCIPConfig,
-	})
-	require.NoError(t, hcr.Start(testutils.Context(t)))
-	t.Cleanup(func() { require.NoError(t, hcr.Close()) })
-
-	return hcr
-}
-
-func (t *TestUniverse) AddDONToRegistry(
-	ccipCapabilityID [32]byte,
-	chainSelector uint64,
-	f uint8,
-	bootstrapP2PID [32]byte,
-	p2pIDs [][32]byte,
-) {
-	tabi, err := ocr3_config_encoder.IOCR3ConfigEncoderMetaData.GetAbi()
-	require.NoError(t.TestingT, err)
-
-	var (
-		signers      [][]byte
-		transmitters [][]byte
-	)
-	for range p2pIDs {
-		signers = append(signers, testutils.NewAddress().Bytes())
-		transmitters = append(transmitters, testutils.NewAddress().Bytes())
-	}
-
-	var ocr3Configs []ocr3_config_encoder.CCIPConfigTypesOCR3Config
-	for _, pluginType := range []cctypes.PluginType{cctypes.PluginTypeCCIPCommit, cctypes.PluginTypeCCIPExec} {
-		ocr3Configs = append(ocr3Configs, ocr3_config_encoder.CCIPConfigTypesOCR3Config{
-			PluginType:            uint8(pluginType),
-			ChainSelector:         chainSelector,
-			F:                     f,
-			OffchainConfigVersion: 30,
-			OfframpAddress:        testutils.NewAddress().Bytes(),
-			BootstrapP2PIds:       [][32]byte{bootstrapP2PID},
-			P2pIds:                p2pIDs,
-			Signers:               signers,
-			Transmitters:          transmitters,
-			OffchainConfig:        []byte("offchain config"),
-		})
-	}
-
-	encodedCall, err := tabi.Pack("exposeOCR3Config", ocr3Configs)
-	require.NoError(t.TestingT, err)
-
-	// Trim first four bytes to remove function selector.
-	encodedConfigs := encodedCall[4:]
-
-	_, err = t.CapReg.AddDON(t.Transactor, p2pIDs, []kcr.CapabilitiesRegistryCapabilityConfiguration{
-		{
-			CapabilityId: ccipCapabilityID,
-			Config:       encodedConfigs,
-		},
-	}, false, false, f)
-	require.NoError(t.TestingT, err)
-	t.Backend.Commit()
-}
-
-func SetupConfigInfo(chainSelector uint64, readers [][32]byte, fChain uint8, cfg []byte) ccip_config.CCIPConfigTypesChainConfigInfo {
-	return ccip_config.CCIPConfigTypesChainConfigInfo{
-		ChainSelector: chainSelector,
-		ChainConfig: ccip_config.CCIPConfigTypesChainConfig{
-			Readers: readers,
-			FChain:  fChain,
-			Config:  cfg,
-		},
-	}
-}
diff --git a/core/capabilities/ccip/ccip_integration_tests/ping_pong_test.go b/core/capabilities/ccip/ccip_integration_tests/ping_pong_test.go
deleted file mode 100644
index 8a65ff5167..0000000000
--- a/core/capabilities/ccip/ccip_integration_tests/ping_pong_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package ccip_integration_tests
-
-import (
-	"testing"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	gethcommon "github.com/ethereum/go-ethereum/common"
-
-	"github.com/stretchr/testify/require"
-
-	"golang.org/x/exp/maps"
-
-	pp "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ping_pong_demo"
-)
-
-/*
-* Test is setting up 3 chains (let's call them A, B, C), each chain deploys and starts 2 ping pong contracts for the other 2.
-* A ---deploy+start---> (pingPongB, pingPongC)
-* B ---deploy+start---> (pingPongA, pingPongC)
-* C ---deploy+start---> (pingPongA, pingPongB)
-* and then checks that each ping pong contract emitted `CCIPSendRequested` event from the expected source to destination.
-* Test fails if any wiring between contracts is not correct.
- */
-func TestPingPong(t *testing.T) {
-	_, universes := createUniverses(t, 3)
-	pingPongs := initializePingPongContracts(t, universes)
-	for chainID, universe := range universes {
-		for otherChain, pingPong := range pingPongs[chainID] {
-			t.Log("PingPong From: ", chainID, " To: ", otherChain)
-			_, err := pingPong.StartPingPong(universe.owner)
-			require.NoError(t, err)
-			universe.backend.Commit()
-
-			logIter, err := universe.onramp.FilterCCIPSendRequested(&bind.FilterOpts{Start: 0}, nil)
-			require.NoError(t, err)
-			// Iterate until latest event
-			for logIter.Next() {
-			}
-			log := logIter.Event
-			require.Equal(t, getSelector(otherChain), log.DestChainSelector)
-			require.Equal(t, pingPong.Address(), log.Message.Sender)
-			chainPingPongAddr := pingPongs[otherChain][chainID].Address().Bytes()
-			// With chain agnostic addresses we need to pad the address to the correct length if the receiver is zero prefixed
-			paddedAddr := gethcommon.LeftPadBytes(chainPingPongAddr, len(log.Message.Receiver))
-			require.Equal(t, paddedAddr, log.Message.Receiver)
-		}
-	}
-}
-
-// InitializeContracts initializes ping pong contracts on all chains and
-// connects them all to each other.
-func initializePingPongContracts(
-	t *testing.T,
-	chainUniverses map[uint64]onchainUniverse,
-) map[uint64]map[uint64]*pp.PingPongDemo {
-	pingPongs := make(map[uint64]map[uint64]*pp.PingPongDemo)
-	chainIDs := maps.Keys(chainUniverses)
-	// For each chain initialize N ping pong contracts, where N is the (number of chains - 1)
-	for chainID, universe := range chainUniverses {
-		pingPongs[chainID] = make(map[uint64]*pp.PingPongDemo)
-		for _, chainToConnect := range chainIDs {
-			if chainToConnect == chainID {
-				continue // don't connect chain to itself
-			}
-			backend := universe.backend
-			owner := universe.owner
-			pingPongAddr, _, _, err := pp.DeployPingPongDemo(owner, backend, universe.router.Address(), universe.linkToken.Address())
-			require.NoError(t, err)
-			backend.Commit()
-			pingPong, err := pp.NewPingPongDemo(pingPongAddr, backend)
-			require.NoError(t, err)
-			backend.Commit()
-			// Fund the ping pong contract with LINK
-			_, err = universe.linkToken.Transfer(owner, pingPong.Address(), e18Mult(10))
-			backend.Commit()
-			require.NoError(t, err)
-			pingPongs[chainID][chainToConnect] = pingPong
-		}
-	}
-
-	// Set up each ping pong contract to its counterpart on the other chain
-	for chainID, universe := range chainUniverses {
-		for chainToConnect, pingPong := range pingPongs[chainID] {
-			_, err := pingPong.SetCounterpart(
-				universe.owner,
-				getSelector(chainUniverses[chainToConnect].chainID),
-				// This is the address of the ping pong contract on the other chain
-				pingPongs[chainToConnect][chainID].Address(),
-			)
-			require.NoError(t, err)
-			universe.backend.Commit()
-		}
-	}
-	return pingPongs
-}
diff --git a/core/capabilities/ccip/ccipevm/commitcodec.go b/core/capabilities/ccip/ccipevm/commitcodec.go
deleted file mode 100644
index 2346c9f141..0000000000
--- a/core/capabilities/ccip/ccipevm/commitcodec.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package ccipevm
-
-import (
-	"context"
-	"fmt"
-	"math/big"
-	"strings"
-
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/abihelpers"
-)
-
-// CommitPluginCodecV1 is a codec for encoding and decoding commit plugin reports.
-// Compatible with:
-// - "OffRamp 1.6.0-dev"
-type CommitPluginCodecV1 struct {
-	commitReportAcceptedEventInputs abi.Arguments
-}
-
-func NewCommitPluginCodecV1() *CommitPluginCodecV1 {
-	abiParsed, err := abi.JSON(strings.NewReader(offramp.OffRampABI))
-	if err != nil {
-		panic(fmt.Errorf("parse multi offramp abi: %s", err))
-	}
-	eventInputs := abihelpers.MustGetEventInputs("CommitReportAccepted", abiParsed)
-	return &CommitPluginCodecV1{commitReportAcceptedEventInputs: eventInputs}
-}
-
-func (c *CommitPluginCodecV1) Encode(ctx context.Context, report cciptypes.CommitPluginReport) ([]byte, error) {
-	merkleRoots := make([]offramp.OffRampMerkleRoot, 0, len(report.MerkleRoots))
-	for _, root := range report.MerkleRoots {
-		merkleRoots = append(merkleRoots, offramp.OffRampMerkleRoot{
-			SourceChainSelector: uint64(root.ChainSel),
-			Interval: offramp.OffRampInterval{
-				Min: uint64(root.SeqNumsRange.Start()),
-				Max: uint64(root.SeqNumsRange.End()),
-			},
-			MerkleRoot: root.MerkleRoot,
-		})
-	}
-
-	tokenPriceUpdates := make([]offramp.InternalTokenPriceUpdate, 0, len(report.PriceUpdates.TokenPriceUpdates))
-	for _, update := range report.PriceUpdates.TokenPriceUpdates {
-		if !common.IsHexAddress(string(update.TokenID)) {
-			return nil, fmt.Errorf("invalid token address: %s", update.TokenID)
-		}
-		if update.Price.IsEmpty() {
-			return nil, fmt.Errorf("empty price for token: %s", update.TokenID)
-		}
-		tokenPriceUpdates = append(tokenPriceUpdates, offramp.InternalTokenPriceUpdate{
-			SourceToken: common.HexToAddress(string(update.TokenID)),
-			UsdPerToken: update.Price.Int,
-		})
-	}
-
-	gasPriceUpdates := make([]offramp.InternalGasPriceUpdate, 0, len(report.PriceUpdates.GasPriceUpdates))
-	for _, update := range report.PriceUpdates.GasPriceUpdates {
-		if update.GasPrice.IsEmpty() {
-			return nil, fmt.Errorf("empty gas price for chain: %d", update.ChainSel)
-		}
-
-		gasPriceUpdates = append(gasPriceUpdates, offramp.InternalGasPriceUpdate{
-			DestChainSelector: uint64(update.ChainSel),
-			UsdPerUnitGas:     update.GasPrice.Int,
-		})
-	}
-
-	evmReport := offramp.OffRampCommitReport{
-		PriceUpdates: offramp.InternalPriceUpdates{
-			TokenPriceUpdates: tokenPriceUpdates,
-			GasPriceUpdates:   gasPriceUpdates,
-		},
-		MerkleRoots: merkleRoots,
-	}
-
-	return c.commitReportAcceptedEventInputs.PackValues([]interface{}{evmReport})
-}
-
-func (c *CommitPluginCodecV1) Decode(ctx context.Context, bytes []byte) (cciptypes.CommitPluginReport, error) {
-	unpacked, err := c.commitReportAcceptedEventInputs.Unpack(bytes)
-	if err != nil {
-		return cciptypes.CommitPluginReport{}, err
-	}
-	if len(unpacked) != 1 {
-		return cciptypes.CommitPluginReport{}, fmt.Errorf("expected 1 argument, got %d", len(unpacked))
-	}
-
-	commitReportRaw := abi.ConvertType(unpacked[0], new(offramp.OffRampCommitReport))
-	commitReport, is := commitReportRaw.(*offramp.OffRampCommitReport)
-	if !is {
-		return cciptypes.CommitPluginReport{},
-			fmt.Errorf("expected OffRampCommitReport, got %T", unpacked[0])
-	}
-
-	merkleRoots := make([]cciptypes.MerkleRootChain, 0, len(commitReport.MerkleRoots))
-	for _, root := range commitReport.MerkleRoots {
-		merkleRoots = append(merkleRoots, cciptypes.MerkleRootChain{
-			ChainSel: cciptypes.ChainSelector(root.SourceChainSelector),
-			SeqNumsRange: cciptypes.NewSeqNumRange(
-				cciptypes.SeqNum(root.Interval.Min),
-				cciptypes.SeqNum(root.Interval.Max),
-			),
-			MerkleRoot: root.MerkleRoot,
-		})
-	}
-
-	tokenPriceUpdates := make([]cciptypes.TokenPrice, 0, len(commitReport.PriceUpdates.TokenPriceUpdates))
-	for _, update := range commitReport.PriceUpdates.TokenPriceUpdates {
-		tokenPriceUpdates = append(tokenPriceUpdates, cciptypes.TokenPrice{
-			TokenID: types.Account(update.SourceToken.String()),
-			Price:   cciptypes.NewBigInt(big.NewInt(0).Set(update.UsdPerToken)),
-		})
-	}
-
-	gasPriceUpdates := make([]cciptypes.GasPriceChain, 0, len(commitReport.PriceUpdates.GasPriceUpdates))
-	for _, update := range commitReport.PriceUpdates.GasPriceUpdates {
-		gasPriceUpdates = append(gasPriceUpdates, cciptypes.GasPriceChain{
-			GasPrice: cciptypes.NewBigInt(big.NewInt(0).Set(update.UsdPerUnitGas)),
-			ChainSel: cciptypes.ChainSelector(update.DestChainSelector),
-		})
-	}
-
-	return cciptypes.CommitPluginReport{
-		MerkleRoots: merkleRoots,
-		PriceUpdates: cciptypes.PriceUpdates{
-			TokenPriceUpdates: tokenPriceUpdates,
-			GasPriceUpdates:   gasPriceUpdates,
-		},
-	}, nil
-}
-
-// Ensure CommitPluginCodec implements the CommitPluginCodec interface
-var _ cciptypes.CommitPluginCodec = (*CommitPluginCodecV1)(nil)
diff --git a/core/capabilities/ccip/ccipevm/commitcodec_test.go b/core/capabilities/ccip/ccipevm/commitcodec_test.go
deleted file mode 100644
index 737f7be1d6..0000000000
--- a/core/capabilities/ccip/ccipevm/commitcodec_test.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package ccipevm
-
-import (
-	"math/big"
-	"math/rand"
-	"testing"
-
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-)
-
-var randomCommitReport = func() cciptypes.CommitPluginReport {
-	return cciptypes.CommitPluginReport{
-		MerkleRoots: []cciptypes.MerkleRootChain{
-			{
-				ChainSel: cciptypes.ChainSelector(rand.Uint64()),
-				SeqNumsRange: cciptypes.NewSeqNumRange(
-					cciptypes.SeqNum(rand.Uint64()),
-					cciptypes.SeqNum(rand.Uint64()),
-				),
-				MerkleRoot: utils.RandomBytes32(),
-			},
-			{
-				ChainSel: cciptypes.ChainSelector(rand.Uint64()),
-				SeqNumsRange: cciptypes.NewSeqNumRange(
-					cciptypes.SeqNum(rand.Uint64()),
-					cciptypes.SeqNum(rand.Uint64()),
-				),
-				MerkleRoot: utils.RandomBytes32(),
-			},
-		},
-		PriceUpdates: cciptypes.PriceUpdates{
-			TokenPriceUpdates: []cciptypes.TokenPrice{
-				{
-					TokenID: types.Account(utils.RandomAddress().String()),
-					Price:   cciptypes.NewBigInt(utils.RandUint256()),
-				},
-			},
-			GasPriceUpdates: []cciptypes.GasPriceChain{
-				{GasPrice: cciptypes.NewBigInt(utils.RandUint256()), ChainSel: cciptypes.ChainSelector(rand.Uint64())},
-				{GasPrice: cciptypes.NewBigInt(utils.RandUint256()), ChainSel: cciptypes.ChainSelector(rand.Uint64())},
-				{GasPrice: cciptypes.NewBigInt(utils.RandUint256()), ChainSel: cciptypes.ChainSelector(rand.Uint64())},
-			},
-		},
-	}
-}
-
-func TestCommitPluginCodecV1(t *testing.T) {
-	testCases := []struct {
-		name   string
-		report func(report cciptypes.CommitPluginReport) cciptypes.CommitPluginReport
-		expErr bool
-	}{
-		{
-			name: "base report",
-			report: func(report cciptypes.CommitPluginReport) cciptypes.CommitPluginReport {
-				return report
-			},
-		},
-		{
-			name: "empty token address",
-			report: func(report cciptypes.CommitPluginReport) cciptypes.CommitPluginReport {
-				report.PriceUpdates.TokenPriceUpdates[0].TokenID = ""
-				return report
-			},
-			expErr: true,
-		},
-		{
-			name: "empty merkle root",
-			report: func(report cciptypes.CommitPluginReport) cciptypes.CommitPluginReport {
-				report.MerkleRoots[0].MerkleRoot = cciptypes.Bytes32{}
-				return report
-			},
-		},
-		{
-			name: "zero token price",
-			report: func(report cciptypes.CommitPluginReport) cciptypes.CommitPluginReport {
-				report.PriceUpdates.TokenPriceUpdates[0].Price = cciptypes.NewBigInt(big.NewInt(0))
-				return report
-			},
-		},
-		{
-			name: "zero gas price",
-			report: func(report cciptypes.CommitPluginReport) cciptypes.CommitPluginReport {
-				report.PriceUpdates.GasPriceUpdates[0].GasPrice = cciptypes.NewBigInt(big.NewInt(0))
-				return report
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			report := tc.report(randomCommitReport())
-			commitCodec := NewCommitPluginCodecV1()
-			ctx := testutils.Context(t)
-			encodedReport, err := commitCodec.Encode(ctx, report)
-			if tc.expErr {
-				assert.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			decodedReport, err := commitCodec.Decode(ctx, encodedReport)
-			require.NoError(t, err)
-			require.Equal(t, report, decodedReport)
-		})
-	}
-}
-
-func BenchmarkCommitPluginCodecV1_Encode(b *testing.B) {
-	commitCodec := NewCommitPluginCodecV1()
-	ctx := testutils.Context(b)
-
-	rep := randomCommitReport()
-	for i := 0; i < b.N; i++ {
-		_, err := commitCodec.Encode(ctx, rep)
-		require.NoError(b, err)
-	}
-}
-
-func BenchmarkCommitPluginCodecV1_Decode(b *testing.B) {
-	commitCodec := NewCommitPluginCodecV1()
-	ctx := testutils.Context(b)
-	encodedReport, err := commitCodec.Encode(ctx, randomCommitReport())
-	require.NoError(b, err)
-
-	for i := 0; i < b.N; i++ {
-		_, err := commitCodec.Decode(ctx, encodedReport)
-		require.NoError(b, err)
-	}
-}
diff --git a/core/capabilities/ccip/ccipevm/executecodec.go b/core/capabilities/ccip/ccipevm/executecodec.go
deleted file mode 100644
index 2349beb390..0000000000
--- a/core/capabilities/ccip/ccipevm/executecodec.go
+++ /dev/null
@@ -1,181 +0,0 @@
-package ccipevm
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/abihelpers"
-)
-
-// ExecutePluginCodecV1 is a codec for encoding and decoding execute plugin reports.
-// Compatible with:
-// - "OffRamp 1.6.0-dev"
-type ExecutePluginCodecV1 struct {
-	executeReportMethodInputs abi.Arguments
-}
-
-func NewExecutePluginCodecV1() *ExecutePluginCodecV1 {
-	abiParsed, err := abi.JSON(strings.NewReader(offramp.OffRampABI))
-	if err != nil {
-		panic(fmt.Errorf("parse multi offramp abi: %s", err))
-	}
-	methodInputs := abihelpers.MustGetMethodInputs("manuallyExecute", abiParsed)
-	if len(methodInputs) == 0 {
-		panic("no inputs found for method: manuallyExecute")
-	}
-
-	return &ExecutePluginCodecV1{
-		executeReportMethodInputs: methodInputs[:1],
-	}
-}
-
-func (e *ExecutePluginCodecV1) Encode(ctx context.Context, report cciptypes.ExecutePluginReport) ([]byte, error) {
-	evmReport := make([]offramp.InternalExecutionReportSingleChain, 0, len(report.ChainReports))
-
-	for _, chainReport := range report.ChainReports {
-		if chainReport.ProofFlagBits.IsEmpty() {
-			return nil, fmt.Errorf("proof flag bits are empty")
-		}
-
-		evmProofs := make([][32]byte, 0, len(chainReport.Proofs))
-		for _, proof := range chainReport.Proofs {
-			evmProofs = append(evmProofs, proof)
-		}
-
-		evmMessages := make([]offramp.InternalAny2EVMRampMessage, 0, len(chainReport.Messages))
-		for _, message := range chainReport.Messages {
-			receiver := common.BytesToAddress(message.Receiver)
-
-			tokenAmounts := make([]offramp.InternalRampTokenAmount, 0, len(message.TokenAmounts))
-			for _, tokenAmount := range message.TokenAmounts {
-				if tokenAmount.Amount.IsEmpty() {
-					return nil, fmt.Errorf("empty amount for token: %s", tokenAmount.DestTokenAddress)
-				}
-
-				tokenAmounts = append(tokenAmounts, offramp.InternalRampTokenAmount{
-					SourcePoolAddress: tokenAmount.SourcePoolAddress,
-					DestTokenAddress:  tokenAmount.DestTokenAddress,
-					ExtraData:         tokenAmount.ExtraData,
-					Amount:            tokenAmount.Amount.Int,
-				})
-			}
-
-			gasLimit, err := decodeExtraArgsV1V2(message.ExtraArgs)
-			if err != nil {
-				return nil, fmt.Errorf("decode extra args to get gas limit: %w", err)
-			}
-
-			evmMessages = append(evmMessages, offramp.InternalAny2EVMRampMessage{
-				Header: offramp.InternalRampMessageHeader{
-					MessageId:           message.Header.MessageID,
-					SourceChainSelector: uint64(message.Header.SourceChainSelector),
-					DestChainSelector:   uint64(message.Header.DestChainSelector),
-					SequenceNumber:      uint64(message.Header.SequenceNumber),
-					Nonce:               message.Header.Nonce,
-				},
-				Sender:       message.Sender,
-				Data:         message.Data,
-				Receiver:     receiver,
-				GasLimit:     gasLimit,
-				TokenAmounts: tokenAmounts,
-			})
-		}
-
-		evmChainReport := offramp.InternalExecutionReportSingleChain{
-			SourceChainSelector: uint64(chainReport.SourceChainSelector),
-			Messages:            evmMessages,
-			OffchainTokenData:   chainReport.OffchainTokenData,
-			Proofs:              evmProofs,
-			ProofFlagBits:       chainReport.ProofFlagBits.Int,
-		}
-		evmReport = append(evmReport, evmChainReport)
-	}
-
-	return e.executeReportMethodInputs.PackValues([]interface{}{&evmReport})
-}
-
-func (e *ExecutePluginCodecV1) Decode(ctx context.Context, encodedReport []byte) (cciptypes.ExecutePluginReport, error) {
-	unpacked, err := e.executeReportMethodInputs.Unpack(encodedReport)
-	if err != nil {
-		return cciptypes.ExecutePluginReport{}, fmt.Errorf("unpack encoded report: %w", err)
-	}
-	if len(unpacked) != 1 {
-		return cciptypes.ExecutePluginReport{}, fmt.Errorf("unpacked report is empty")
-	}
-
-	evmReportRaw := abi.ConvertType(unpacked[0], new([]offramp.InternalExecutionReportSingleChain))
-	evmReportPtr, is := evmReportRaw.(*[]offramp.InternalExecutionReportSingleChain)
-	if !is {
-		return cciptypes.ExecutePluginReport{}, fmt.Errorf("got an unexpected report type %T", unpacked[0])
-	}
-	if evmReportPtr == nil {
-		return cciptypes.ExecutePluginReport{}, fmt.Errorf("evm report is nil")
-	}
-
-	evmReport := *evmReportPtr
-	executeReport := cciptypes.ExecutePluginReport{
-		ChainReports: make([]cciptypes.ExecutePluginReportSingleChain, 0, len(evmReport)),
-	}
-
-	for _, evmChainReport := range evmReport {
-		proofs := make([]cciptypes.Bytes32, 0, len(evmChainReport.Proofs))
-		for _, proof := range evmChainReport.Proofs {
-			proofs = append(proofs, proof)
-		}
-
-		messages := make([]cciptypes.Message, 0, len(evmChainReport.Messages))
-		for _, evmMessage := range evmChainReport.Messages {
-			tokenAmounts := make([]cciptypes.RampTokenAmount, 0, len(evmMessage.TokenAmounts))
-			for _, tokenAmount := range evmMessage.TokenAmounts {
-				tokenAmounts = append(tokenAmounts, cciptypes.RampTokenAmount{
-					SourcePoolAddress: tokenAmount.SourcePoolAddress,
-					DestTokenAddress:  tokenAmount.DestTokenAddress,
-					ExtraData:         tokenAmount.ExtraData,
-					Amount:            cciptypes.NewBigInt(tokenAmount.Amount),
-				})
-			}
-
-			message := cciptypes.Message{
-				Header: cciptypes.RampMessageHeader{
-					MessageID:           evmMessage.Header.MessageId,
-					SourceChainSelector: cciptypes.ChainSelector(evmMessage.Header.SourceChainSelector),
-					DestChainSelector:   cciptypes.ChainSelector(evmMessage.Header.DestChainSelector),
-					SequenceNumber:      cciptypes.SeqNum(evmMessage.Header.SequenceNumber),
-					Nonce:               evmMessage.Header.Nonce,
-					MsgHash:             cciptypes.Bytes32{}, // <-- todo: info not available, but not required atm
-					OnRamp:              cciptypes.Bytes{},   // <-- todo: info not available, but not required atm
-				},
-				Sender:         evmMessage.Sender,
-				Data:           evmMessage.Data,
-				Receiver:       evmMessage.Receiver.Bytes(),
-				ExtraArgs:      cciptypes.Bytes{},  // <-- todo: info not available, but not required atm
-				FeeToken:       cciptypes.Bytes{},  // <-- todo: info not available, but not required atm
-				FeeTokenAmount: cciptypes.BigInt{}, // <-- todo: info not available, but not required atm
-				TokenAmounts:   tokenAmounts,
-			}
-			messages = append(messages, message)
-		}
-
-		chainReport := cciptypes.ExecutePluginReportSingleChain{
-			SourceChainSelector: cciptypes.ChainSelector(evmChainReport.SourceChainSelector),
-			Messages:            messages,
-			OffchainTokenData:   evmChainReport.OffchainTokenData,
-			Proofs:              proofs,
-			ProofFlagBits:       cciptypes.NewBigInt(evmChainReport.ProofFlagBits),
-		}
-
-		executeReport.ChainReports = append(executeReport.ChainReports, chainReport)
-	}
-
-	return executeReport, nil
-}
-
-// Ensure ExecutePluginCodec implements the ExecutePluginCodec interface
-var _ cciptypes.ExecutePluginCodec = (*ExecutePluginCodecV1)(nil)
diff --git a/core/capabilities/ccip/ccipevm/executecodec_test.go b/core/capabilities/ccip/ccipevm/executecodec_test.go
deleted file mode 100644
index 4f207fdb0e..0000000000
--- a/core/capabilities/ccip/ccipevm/executecodec_test.go
+++ /dev/null
@@ -1,174 +0,0 @@
-package ccipevm
-
-import (
-	"math/rand"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/core"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/message_hasher"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/report_codec"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-var randomExecuteReport = func(t *testing.T, d *testSetupData) cciptypes.ExecutePluginReport {
-	const numChainReports = 10
-	const msgsPerReport = 10
-	const numTokensPerMsg = 3
-
-	chainReports := make([]cciptypes.ExecutePluginReportSingleChain, numChainReports)
-	for i := 0; i < numChainReports; i++ {
-		reportMessages := make([]cciptypes.Message, msgsPerReport)
-		for j := 0; j < msgsPerReport; j++ {
-			data, err := cciptypes.NewBytesFromString(utils.RandomAddress().String())
-			assert.NoError(t, err)
-
-			tokenAmounts := make([]cciptypes.RampTokenAmount, numTokensPerMsg)
-			for z := 0; z < numTokensPerMsg; z++ {
-				tokenAmounts[z] = cciptypes.RampTokenAmount{
-					SourcePoolAddress: utils.RandomAddress().Bytes(),
-					DestTokenAddress:  utils.RandomAddress().Bytes(),
-					ExtraData:         data,
-					Amount:            cciptypes.NewBigInt(utils.RandUint256()),
-				}
-			}
-
-			extraArgs, err := d.contract.EncodeEVMExtraArgsV1(nil, message_hasher.ClientEVMExtraArgsV1{
-				GasLimit: utils.RandUint256(),
-			})
-			assert.NoError(t, err)
-
-			reportMessages[j] = cciptypes.Message{
-				Header: cciptypes.RampMessageHeader{
-					MessageID:           utils.RandomBytes32(),
-					SourceChainSelector: cciptypes.ChainSelector(rand.Uint64()),
-					DestChainSelector:   cciptypes.ChainSelector(rand.Uint64()),
-					SequenceNumber:      cciptypes.SeqNum(rand.Uint64()),
-					Nonce:               rand.Uint64(),
-					MsgHash:             utils.RandomBytes32(),
-					OnRamp:              utils.RandomAddress().Bytes(),
-				},
-				Sender:         utils.RandomAddress().Bytes(),
-				Data:           data,
-				Receiver:       utils.RandomAddress().Bytes(),
-				ExtraArgs:      extraArgs,
-				FeeToken:       utils.RandomAddress().Bytes(),
-				FeeTokenAmount: cciptypes.NewBigInt(utils.RandUint256()),
-				TokenAmounts:   tokenAmounts,
-			}
-		}
-
-		tokenData := make([][][]byte, numTokensPerMsg)
-		for j := 0; j < numTokensPerMsg; j++ {
-			tokenData[j] = [][]byte{{0x1}, {0x2, 0x3}}
-		}
-
-		chainReports[i] = cciptypes.ExecutePluginReportSingleChain{
-			SourceChainSelector: cciptypes.ChainSelector(rand.Uint64()),
-			Messages:            reportMessages,
-			OffchainTokenData:   tokenData,
-			Proofs:              []cciptypes.Bytes32{utils.RandomBytes32(), utils.RandomBytes32()},
-			ProofFlagBits:       cciptypes.NewBigInt(utils.RandUint256()),
-		}
-	}
-
-	return cciptypes.ExecutePluginReport{ChainReports: chainReports}
-}
-
-func TestExecutePluginCodecV1(t *testing.T) {
-	d := testSetup(t)
-
-	testCases := []struct {
-		name   string
-		report func(report cciptypes.ExecutePluginReport) cciptypes.ExecutePluginReport
-		expErr bool
-	}{
-		{
-			name:   "base report",
-			report: func(report cciptypes.ExecutePluginReport) cciptypes.ExecutePluginReport { return report },
-			expErr: false,
-		},
-		{
-			name: "reports have empty msgs",
-			report: func(report cciptypes.ExecutePluginReport) cciptypes.ExecutePluginReport {
-				report.ChainReports[0].Messages = []cciptypes.Message{}
-				report.ChainReports[4].Messages = []cciptypes.Message{}
-				return report
-			},
-			expErr: false,
-		},
-		{
-			name: "reports have empty offchain token data",
-			report: func(report cciptypes.ExecutePluginReport) cciptypes.ExecutePluginReport {
-				report.ChainReports[0].OffchainTokenData = [][][]byte{}
-				report.ChainReports[4].OffchainTokenData[1] = [][]byte{}
-				return report
-			},
-			expErr: false,
-		},
-	}
-
-	ctx := testutils.Context(t)
-
-	// Deploy the contract
-	transactor := testutils.MustNewSimTransactor(t)
-	simulatedBackend := backends.NewSimulatedBackend(core.GenesisAlloc{
-		transactor.From: {Balance: assets.Ether(1000).ToInt()},
-	}, 30e6)
-	address, _, _, err := report_codec.DeployReportCodec(transactor, simulatedBackend)
-	require.NoError(t, err)
-	simulatedBackend.Commit()
-	contract, err := report_codec.NewReportCodec(address, simulatedBackend)
-	require.NoError(t, err)
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			codec := NewExecutePluginCodecV1()
-			report := tc.report(randomExecuteReport(t, d))
-			bytes, err := codec.Encode(ctx, report)
-			if tc.expErr {
-				assert.Error(t, err)
-				return
-			}
-			assert.NoError(t, err)
-
-			testSetup(t)
-
-			// ignore msg hash in comparison
-			for i := range report.ChainReports {
-				for j := range report.ChainReports[i].Messages {
-					report.ChainReports[i].Messages[j].Header.MsgHash = cciptypes.Bytes32{}
-					report.ChainReports[i].Messages[j].Header.OnRamp = cciptypes.Bytes{}
-					report.ChainReports[i].Messages[j].FeeToken = cciptypes.Bytes{}
-					report.ChainReports[i].Messages[j].ExtraArgs = cciptypes.Bytes{}
-					report.ChainReports[i].Messages[j].FeeTokenAmount = cciptypes.BigInt{}
-				}
-			}
-
-			// decode using the contract
-			contractDecodedReport, err := contract.DecodeExecuteReport(&bind.CallOpts{Context: ctx}, bytes)
-			assert.NoError(t, err)
-			assert.Equal(t, len(report.ChainReports), len(contractDecodedReport))
-			for i, expReport := range report.ChainReports {
-				actReport := contractDecodedReport[i]
-				assert.Equal(t, expReport.OffchainTokenData, actReport.OffchainTokenData)
-				assert.Equal(t, len(expReport.Messages), len(actReport.Messages))
-				assert.Equal(t, uint64(expReport.SourceChainSelector), actReport.SourceChainSelector)
-			}
-
-			// decode using the codec
-			codecDecoded, err := codec.Decode(ctx, bytes)
-			assert.NoError(t, err)
-			assert.Equal(t, report, codecDecoded)
-		})
-	}
-}
diff --git a/core/capabilities/ccip/ccipevm/gas_helpers.go b/core/capabilities/ccip/ccipevm/gas_helpers.go
deleted file mode 100644
index 41acb2a15f..0000000000
--- a/core/capabilities/ccip/ccipevm/gas_helpers.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package ccipevm
-
-import (
-	"math"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-)
-
-const (
-	EvmAddressLengthBytes           = 20
-	EvmWordBytes                    = 32
-	CalldataGasPerByte              = 16
-	TokenAdminRegistryWarmupCost    = 2_500
-	TokenAdminRegistryPoolLookupGas = 100 + // WARM_ACCESS_COST TokenAdminRegistry
-		700 + // CALL cost for TokenAdminRegistry
-		2_100 // COLD_SLOAD_COST loading the pool address
-	SupportsInterfaceCheck = 2600 + // because the receiver will be untouched initially
-		30_000*3 // supportsInterface of ERC165Checker library performs 3 static-calls of 30k gas each
-	PerTokenOverheadGas = TokenAdminRegistryPoolLookupGas +
-		SupportsInterfaceCheck +
-		200_000 + // releaseOrMint using callWithExactGas
-		50_000 // transfer using callWithExactGas
-	RateLimiterOverheadGas = 2_100 + // COLD_SLOAD_COST for accessing token bucket
-		5_000 // SSTORE_RESET_GAS for updating & decreasing token bucket
-	ConstantMessagePartBytes            = 10 * 32 // A message consists of 10 abi encoded fields 32B each (after encoding)
-	ExecutionStateProcessingOverheadGas = 2_100 + // COLD_SLOAD_COST for first reading the state
-		20_000 + // SSTORE_SET_GAS for writing from 0 (untouched) to non-zero (in-progress)
-		100 //# SLOAD_GAS = WARM_STORAGE_READ_COST for rewriting from non-zero (in-progress) to non-zero (success/failure)
-)
-
-func NewGasEstimateProvider() EstimateProvider {
-	return EstimateProvider{}
-}
-
-type EstimateProvider struct {
-}
-
-// CalculateMerkleTreeGas estimates the merkle tree gas based on number of requests
-func (gp EstimateProvider) CalculateMerkleTreeGas(numRequests int) uint64 {
-	if numRequests == 0 {
-		return 0
-	}
-	merkleProofBytes := (math.Ceil(math.Log2(float64(numRequests))))*32 + (1+2)*32 // only ever one outer root hash
-	return uint64(merkleProofBytes * CalldataGasPerByte)
-}
-
-// return the size of bytes for msg tokens
-func bytesForMsgTokens(numTokens int) int {
-	// token address (address) + token amount (uint256)
-	return (EvmAddressLengthBytes + EvmWordBytes) * numTokens
-}
-
-// CalculateMessageMaxGas computes the maximum gas overhead for a message.
-func (gp EstimateProvider) CalculateMessageMaxGas(msg cciptypes.Message) uint64 {
-	numTokens := len(msg.TokenAmounts)
-	var data []byte = msg.Data
-	dataLength := len(data)
-
-	// TODO: update interface to return error?
-	// Although this decoding should never fail.
-	messageGasLimit, err := decodeExtraArgsV1V2(msg.ExtraArgs)
-	if err != nil {
-		panic(err)
-	}
-
-	messageBytes := ConstantMessagePartBytes +
-		bytesForMsgTokens(numTokens) +
-		dataLength
-
-	messageCallDataGas := uint64(messageBytes * CalldataGasPerByte)
-
-	// Rate limiter only limits value in tokens. It's not called if there are no
-	// tokens in the message. The same goes for the admin registry, it's only loaded
-	// if there are tokens, and it's only loaded once.
-	rateLimiterOverhead := uint64(0)
-	adminRegistryOverhead := uint64(0)
-	if numTokens >= 1 {
-		rateLimiterOverhead = RateLimiterOverheadGas
-		adminRegistryOverhead = TokenAdminRegistryWarmupCost
-	}
-
-	return messageGasLimit.Uint64() +
-		messageCallDataGas +
-		ExecutionStateProcessingOverheadGas +
-		SupportsInterfaceCheck +
-		adminRegistryOverhead +
-		rateLimiterOverhead +
-		PerTokenOverheadGas*uint64(numTokens)
-}
diff --git a/core/capabilities/ccip/ccipevm/gas_helpers_test.go b/core/capabilities/ccip/ccipevm/gas_helpers_test.go
deleted file mode 100644
index f7897898fb..0000000000
--- a/core/capabilities/ccip/ccipevm/gas_helpers_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package ccipevm
-
-import (
-	"math/big"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-)
-
-func Test_calculateMessageMaxGas(t *testing.T) {
-	type args struct {
-		dataLen   int
-		numTokens int
-		extraArgs []byte
-	}
-	tests := []struct {
-		name string
-		args args
-		want uint64
-	}{
-		{
-			name: "base",
-			args: args{dataLen: 5, numTokens: 2, extraArgs: makeExtraArgsV1(200_000)},
-			want: 1_022_264,
-		},
-		{
-			name: "large",
-			args: args{dataLen: 1000, numTokens: 1000, extraArgs: makeExtraArgsV1(200_000)},
-			want: 346_677_520,
-		},
-		{
-			name: "overheadGas test 1",
-			args: args{dataLen: 0, numTokens: 0, extraArgs: makeExtraArgsV1(200_000)},
-			want: 319_920,
-		},
-		{
-			name: "overheadGas test 2",
-			args: args{dataLen: len([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}), numTokens: 1, extraArgs: makeExtraArgsV1(200_000)},
-			want: 675_948,
-		},
-		{
-			name: "allowOOO set to true makes no difference to final gas estimate",
-			args: args{dataLen: 5, numTokens: 2, extraArgs: makeExtraArgsV2(200_000, true)},
-			want: 1_022_264,
-		},
-		{
-			name: "allowOOO set to false makes no difference to final gas estimate",
-			args: args{dataLen: 5, numTokens: 2, extraArgs: makeExtraArgsV2(200_000, false)},
-			want: 1_022_264,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			msg := ccipocr3.Message{
-				Data:         make([]byte, tt.args.dataLen),
-				TokenAmounts: make([]ccipocr3.RampTokenAmount, tt.args.numTokens),
-				ExtraArgs:    tt.args.extraArgs,
-			}
-			ep := EstimateProvider{}
-			got := ep.CalculateMessageMaxGas(msg)
-			t.Log(got)
-			assert.Equalf(t, tt.want, got, "calculateMessageMaxGas(%v, %v)", tt.args.dataLen, tt.args.numTokens)
-		})
-	}
-}
-
-// TestCalculateMaxGas is taken from the ccip repo where the CalculateMerkleTreeGas and CalculateMessageMaxGas values
-// are combined to one function.
-func TestCalculateMaxGas(t *testing.T) {
-	tests := []struct {
-		name           string
-		numRequests    int
-		dataLength     int
-		numberOfTokens int
-		extraArgs      []byte
-		want           uint64
-	}{
-		{
-			name:           "maxGasOverheadGas 1",
-			numRequests:    6,
-			dataLength:     0,
-			numberOfTokens: 0,
-			extraArgs:      makeExtraArgsV1(200_000),
-			want:           322_992,
-		},
-		{
-			name:           "maxGasOverheadGas 2",
-			numRequests:    3,
-			dataLength:     len([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}),
-			numberOfTokens: 1,
-			extraArgs:      makeExtraArgsV1(200_000),
-			want:           678_508,
-		},
-		{
-			name:           "v2 extra args",
-			numRequests:    3,
-			dataLength:     len([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}),
-			numberOfTokens: 1,
-			extraArgs:      makeExtraArgsV2(200_000, true),
-			want:           678_508,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			msg := ccipocr3.Message{
-				Data:         make([]byte, tt.dataLength),
-				TokenAmounts: make([]ccipocr3.RampTokenAmount, tt.numberOfTokens),
-				ExtraArgs:    tt.extraArgs,
-			}
-			ep := EstimateProvider{}
-
-			gotTree := ep.CalculateMerkleTreeGas(tt.numRequests)
-			gotMsg := ep.CalculateMessageMaxGas(msg)
-			t.Log("want", tt.want, "got", gotTree+gotMsg)
-			assert.Equal(t, tt.want, gotTree+gotMsg)
-		})
-	}
-}
-
-func makeExtraArgsV1(gasLimit uint64) []byte {
-	// extra args is the tag followed by the gas limit abi-encoded.
-	var extraArgs []byte
-	extraArgs = append(extraArgs, evmExtraArgsV1Tag...)
-	gasLimitBytes := new(big.Int).SetUint64(gasLimit).Bytes()
-	// pad from the left to 32 bytes
-	gasLimitBytes = common.LeftPadBytes(gasLimitBytes, 32)
-	extraArgs = append(extraArgs, gasLimitBytes...)
-	return extraArgs
-}
-
-func makeExtraArgsV2(gasLimit uint64, allowOOO bool) []byte {
-	// extra args is the tag followed by the gas limit and allowOOO abi-encoded.
-	var extraArgs []byte
-	extraArgs = append(extraArgs, evmExtraArgsV2Tag...)
-	gasLimitBytes := new(big.Int).SetUint64(gasLimit).Bytes()
-	// pad from the left to 32 bytes
-	gasLimitBytes = common.LeftPadBytes(gasLimitBytes, 32)
-
-	// abi-encode allowOOO
-	var allowOOOBytes []byte
-	if allowOOO {
-		allowOOOBytes = append(allowOOOBytes, 1)
-	} else {
-		allowOOOBytes = append(allowOOOBytes, 0)
-	}
-	// pad from the left to 32 bytes
-	allowOOOBytes = common.LeftPadBytes(allowOOOBytes, 32)
-
-	extraArgs = append(extraArgs, gasLimitBytes...)
-	extraArgs = append(extraArgs, allowOOOBytes...)
-	return extraArgs
-}
diff --git a/core/capabilities/ccip/ccipevm/helpers.go b/core/capabilities/ccip/ccipevm/helpers.go
deleted file mode 100644
index ee83230a4c..0000000000
--- a/core/capabilities/ccip/ccipevm/helpers.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package ccipevm
-
-import (
-	"bytes"
-	"fmt"
-	"math/big"
-)
-
-func decodeExtraArgsV1V2(extraArgs []byte) (gasLimit *big.Int, err error) {
-	if len(extraArgs) < 4 {
-		return nil, fmt.Errorf("extra args too short: %d, should be at least 4 (i.e the extraArgs tag)", len(extraArgs))
-	}
-
-	var method string
-	if bytes.Equal(extraArgs[:4], evmExtraArgsV1Tag) {
-		method = "decodeEVMExtraArgsV1"
-	} else if bytes.Equal(extraArgs[:4], evmExtraArgsV2Tag) {
-		method = "decodeEVMExtraArgsV2"
-	} else {
-		return nil, fmt.Errorf("unknown extra args tag: %x", extraArgs)
-	}
-	ifaces, err := messageHasherABI.Methods[method].Inputs.UnpackValues(extraArgs[4:])
-	if err != nil {
-		return nil, fmt.Errorf("abi decode extra args v1: %w", err)
-	}
-	// gas limit is always the first argument, and allow OOO isn't set explicitly
-	// on the message.
-	_, ok := ifaces[0].(*big.Int)
-	if !ok {
-		return nil, fmt.Errorf("expected *big.Int, got %T", ifaces[0])
-	}
-	return ifaces[0].(*big.Int), nil
-}
diff --git a/core/capabilities/ccip/ccipevm/helpers_test.go b/core/capabilities/ccip/ccipevm/helpers_test.go
deleted file mode 100644
index 95a5d4439b..0000000000
--- a/core/capabilities/ccip/ccipevm/helpers_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package ccipevm
-
-import (
-	"math/big"
-	"math/rand"
-	"testing"
-
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/message_hasher"
-
-	"github.com/stretchr/testify/require"
-)
-
-func Test_decodeExtraArgs(t *testing.T) {
-	d := testSetup(t)
-	gasLimit := big.NewInt(rand.Int63())
-
-	t.Run("v1", func(t *testing.T) {
-		encoded, err := d.contract.EncodeEVMExtraArgsV1(nil, message_hasher.ClientEVMExtraArgsV1{
-			GasLimit: gasLimit,
-		})
-		require.NoError(t, err)
-
-		decodedGasLimit, err := decodeExtraArgsV1V2(encoded)
-		require.NoError(t, err)
-
-		require.Equal(t, gasLimit, decodedGasLimit)
-	})
-
-	t.Run("v2", func(t *testing.T) {
-		encoded, err := d.contract.EncodeEVMExtraArgsV2(nil, message_hasher.ClientEVMExtraArgsV2{
-			GasLimit:                 gasLimit,
-			AllowOutOfOrderExecution: true,
-		})
-		require.NoError(t, err)
-
-		decodedGasLimit, err := decodeExtraArgsV1V2(encoded)
-		require.NoError(t, err)
-
-		require.Equal(t, gasLimit, decodedGasLimit)
-	})
-}
diff --git a/core/capabilities/ccip/ccipevm/msghasher.go b/core/capabilities/ccip/ccipevm/msghasher.go
deleted file mode 100644
index e620d96a43..0000000000
--- a/core/capabilities/ccip/ccipevm/msghasher.go
+++ /dev/null
@@ -1,127 +0,0 @@
-package ccipevm
-
-import (
-	"context"
-	"fmt"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/message_hasher"
-)
-
-var (
-	// bytes32 internal constant LEAF_DOMAIN_SEPARATOR = 0x0000000000000000000000000000000000000000000000000000000000000000;
-	leafDomainSeparator = [32]byte{}
-
-	// bytes32 internal constant ANY_2_EVM_MESSAGE_HASH = keccak256("Any2EVMMessageHashV1");
-	ANY_2_EVM_MESSAGE_HASH = utils.Keccak256Fixed([]byte("Any2EVMMessageHashV1"))
-
-	messageHasherABI = types.MustGetABI(message_hasher.MessageHasherABI)
-
-	// bytes4 public constant EVM_EXTRA_ARGS_V1_TAG = 0x97a657c9;
-	evmExtraArgsV1Tag = hexutil.MustDecode("0x97a657c9")
-
-	// bytes4 public constant EVM_EXTRA_ARGS_V2_TAG = 0x181dcf10;
-	evmExtraArgsV2Tag = hexutil.MustDecode("0x181dcf10")
-)
-
-// MessageHasherV1 implements the MessageHasher interface.
-// Compatible with:
-// - "OnRamp 1.6.0-dev"
-type MessageHasherV1 struct{}
-
-func NewMessageHasherV1() *MessageHasherV1 {
-	return &MessageHasherV1{}
-}
-
-// Hash implements the MessageHasher interface.
-// It constructs all of the inputs to the final keccak256 hash in Internal._hash(Any2EVMRampMessage).
-// The main structure of the hash is as follows:
-/*
-	keccak256(
-		leafDomainSeparator,
-		keccak256(any_2_evm_message_hash, header.sourceChainSelector, header.destinationChainSelector, onRamp),
-		keccak256(fixedSizeMessageFields),
-		keccak256(messageData),
-		keccak256(encodedRampTokenAmounts),
-	)
-*/
-func (h *MessageHasherV1) Hash(_ context.Context, msg cciptypes.Message) (cciptypes.Bytes32, error) {
-	var rampTokenAmounts []message_hasher.InternalRampTokenAmount
-	for _, rta := range msg.TokenAmounts {
-		rampTokenAmounts = append(rampTokenAmounts, message_hasher.InternalRampTokenAmount{
-			SourcePoolAddress: rta.SourcePoolAddress,
-			DestTokenAddress:  rta.DestTokenAddress,
-			ExtraData:         rta.ExtraData,
-			Amount:            rta.Amount.Int,
-		})
-	}
-	encodedRampTokenAmounts, err := abiEncode("encodeTokenAmountsHashPreimage", rampTokenAmounts)
-	if err != nil {
-		return [32]byte{}, fmt.Errorf("abi encode token amounts: %w", err)
-	}
-
-	metaDataHashInput, err := abiEncode(
-		"encodeMetadataHashPreimage",
-		ANY_2_EVM_MESSAGE_HASH,
-		uint64(msg.Header.SourceChainSelector),
-		uint64(msg.Header.DestChainSelector),
-		[]byte(msg.Header.OnRamp),
-	)
-	if err != nil {
-		return [32]byte{}, fmt.Errorf("abi encode metadata hash input: %w", err)
-	}
-
-	// Need to decode the extra args to get the gas limit.
-	// TODO: we assume that extra args is always abi-encoded for now, but we need
-	// to decode according to source chain selector family. We should add a family
-	// lookup API to the chain-selectors library.
-	gasLimit, err := decodeExtraArgsV1V2(msg.ExtraArgs)
-	if err != nil {
-		return [32]byte{}, fmt.Errorf("decode extra args: %w", err)
-	}
-
-	fixedSizeFieldsEncoded, err := abiEncode(
-		"encodeFixedSizeFieldsHashPreimage",
-		msg.Header.MessageID,
-		[]byte(msg.Sender),
-		common.BytesToAddress(msg.Receiver),
-		uint64(msg.Header.SequenceNumber),
-		gasLimit,
-		msg.Header.Nonce,
-	)
-	if err != nil {
-		return [32]byte{}, fmt.Errorf("abi encode fixed size values: %w", err)
-	}
-
-	packedValues, err := abiEncode(
-		"encodeFinalHashPreimage",
-		leafDomainSeparator,
-		utils.Keccak256Fixed(metaDataHashInput),
-		utils.Keccak256Fixed(fixedSizeFieldsEncoded),
-		utils.Keccak256Fixed(msg.Data),
-		utils.Keccak256Fixed(encodedRampTokenAmounts),
-	)
-	if err != nil {
-		return [32]byte{}, fmt.Errorf("abi encode packed values: %w", err)
-	}
-
-	return utils.Keccak256Fixed(packedValues), nil
-}
-
-func abiEncode(method string, values ...interface{}) ([]byte, error) {
-	res, err := messageHasherABI.Pack(method, values...)
-	if err != nil {
-		return nil, err
-	}
-	// trim the method selector.
-	return res[4:], nil
-}
-
-// Interface compliance check
-var _ cciptypes.MessageHasher = (*MessageHasherV1)(nil)
diff --git a/core/capabilities/ccip/ccipevm/msghasher_test.go b/core/capabilities/ccip/ccipevm/msghasher_test.go
deleted file mode 100644
index 911a10b26a..0000000000
--- a/core/capabilities/ccip/ccipevm/msghasher_test.go
+++ /dev/null
@@ -1,189 +0,0 @@
-package ccipevm
-
-import (
-	"context"
-	cryptorand "crypto/rand"
-	"fmt"
-	"math/big"
-	"math/rand"
-	"strings"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/stretchr/testify/require"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/message_hasher"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-)
-
-// NOTE: these test cases are only EVM <-> EVM.
-// Update these cases once we have non-EVM examples.
-func TestMessageHasher_EVM2EVM(t *testing.T) {
-	ctx := testutils.Context(t)
-	d := testSetup(t)
-
-	testCases := []evmExtraArgs{
-		{version: "v1", gasLimit: big.NewInt(rand.Int63())},
-		{version: "v2", gasLimit: big.NewInt(rand.Int63()), allowOOO: false},
-		{version: "v2", gasLimit: big.NewInt(rand.Int63()), allowOOO: true},
-	}
-	for i, tc := range testCases {
-		t.Run(fmt.Sprintf("tc_%d", i), func(tt *testing.T) {
-			testHasherEVM2EVM(ctx, tt, d, tc)
-		})
-	}
-}
-
-func testHasherEVM2EVM(ctx context.Context, t *testing.T, d *testSetupData, evmExtraArgs evmExtraArgs) {
-	ccipMsg := createEVM2EVMMessage(t, d.contract, evmExtraArgs)
-
-	var tokenAmounts []message_hasher.InternalRampTokenAmount
-	for _, rta := range ccipMsg.TokenAmounts {
-		tokenAmounts = append(tokenAmounts, message_hasher.InternalRampTokenAmount{
-			SourcePoolAddress: rta.SourcePoolAddress,
-			DestTokenAddress:  rta.DestTokenAddress,
-			ExtraData:         rta.ExtraData[:],
-			Amount:            rta.Amount.Int,
-		})
-	}
-	evmMsg := message_hasher.InternalAny2EVMRampMessage{
-		Header: message_hasher.InternalRampMessageHeader{
-			MessageId:           ccipMsg.Header.MessageID,
-			SourceChainSelector: uint64(ccipMsg.Header.SourceChainSelector),
-			DestChainSelector:   uint64(ccipMsg.Header.DestChainSelector),
-			SequenceNumber:      uint64(ccipMsg.Header.SequenceNumber),
-			Nonce:               ccipMsg.Header.Nonce,
-		},
-		Sender:       ccipMsg.Sender,
-		Receiver:     common.BytesToAddress(ccipMsg.Receiver),
-		GasLimit:     evmExtraArgs.gasLimit,
-		Data:         ccipMsg.Data,
-		TokenAmounts: tokenAmounts,
-	}
-
-	expectedHash, err := d.contract.Hash(&bind.CallOpts{Context: ctx}, evmMsg, ccipMsg.Header.OnRamp)
-	require.NoError(t, err)
-
-	evmMsgHasher := NewMessageHasherV1()
-	actualHash, err := evmMsgHasher.Hash(ctx, ccipMsg)
-	require.NoError(t, err)
-
-	require.Equal(t, fmt.Sprintf("%x", expectedHash), strings.TrimPrefix(actualHash.String(), "0x"))
-}
-
-type evmExtraArgs struct {
-	version  string
-	gasLimit *big.Int
-	allowOOO bool
-}
-
-func createEVM2EVMMessage(t *testing.T, messageHasher *message_hasher.MessageHasher, evmExtraArgs evmExtraArgs) cciptypes.Message {
-	messageID := utils.RandomBytes32()
-
-	sourceTokenData := make([]byte, rand.Intn(2048))
-	_, err := cryptorand.Read(sourceTokenData)
-	require.NoError(t, err)
-
-	sourceChain := rand.Uint64()
-	seqNum := rand.Uint64()
-	nonce := rand.Uint64()
-	destChain := rand.Uint64()
-
-	var extraArgsBytes []byte
-	if evmExtraArgs.version == "v1" {
-		extraArgsBytes, err = messageHasher.EncodeEVMExtraArgsV1(nil, message_hasher.ClientEVMExtraArgsV1{
-			GasLimit: evmExtraArgs.gasLimit,
-		})
-		require.NoError(t, err)
-	} else if evmExtraArgs.version == "v2" {
-		extraArgsBytes, err = messageHasher.EncodeEVMExtraArgsV2(nil, message_hasher.ClientEVMExtraArgsV2{
-			GasLimit:                 evmExtraArgs.gasLimit,
-			AllowOutOfOrderExecution: evmExtraArgs.allowOOO,
-		})
-		require.NoError(t, err)
-	} else {
-		require.FailNowf(t, "unknown extra args version", "version: %s", evmExtraArgs.version)
-	}
-
-	messageData := make([]byte, rand.Intn(2048))
-	_, err = cryptorand.Read(messageData)
-	require.NoError(t, err)
-
-	numTokens := rand.Intn(10)
-	var sourceTokenDatas [][]byte
-	for i := 0; i < numTokens; i++ {
-		sourceTokenDatas = append(sourceTokenDatas, sourceTokenData)
-	}
-
-	var tokenAmounts []cciptypes.RampTokenAmount
-	for i := 0; i < len(sourceTokenDatas); i++ {
-		extraData := utils.RandomBytes32()
-		tokenAmounts = append(tokenAmounts, cciptypes.RampTokenAmount{
-			SourcePoolAddress: abiEncodedAddress(t),
-			DestTokenAddress:  abiEncodedAddress(t),
-			ExtraData:         extraData[:],
-			Amount:            cciptypes.NewBigInt(big.NewInt(0).SetUint64(rand.Uint64())),
-		})
-	}
-
-	return cciptypes.Message{
-		Header: cciptypes.RampMessageHeader{
-			MessageID:           messageID,
-			SourceChainSelector: cciptypes.ChainSelector(sourceChain),
-			DestChainSelector:   cciptypes.ChainSelector(destChain),
-			SequenceNumber:      cciptypes.SeqNum(seqNum),
-			Nonce:               nonce,
-			OnRamp:              abiEncodedAddress(t),
-		},
-		Sender:         abiEncodedAddress(t),
-		Receiver:       abiEncodedAddress(t),
-		Data:           messageData,
-		TokenAmounts:   tokenAmounts,
-		FeeToken:       abiEncodedAddress(t),
-		FeeTokenAmount: cciptypes.NewBigInt(big.NewInt(0).SetUint64(rand.Uint64())),
-		ExtraArgs:      extraArgsBytes,
-	}
-}
-
-func abiEncodedAddress(t *testing.T) []byte {
-	addr := utils.RandomAddress()
-	encoded, err := utils.ABIEncode(`[{"type": "address"}]`, addr)
-	require.NoError(t, err)
-	return encoded
-}
-
-type testSetupData struct {
-	contractAddr common.Address
-	contract     *message_hasher.MessageHasher
-	sb           *backends.SimulatedBackend
-	auth         *bind.TransactOpts
-}
-
-func testSetup(t *testing.T) *testSetupData {
-	transactor := testutils.MustNewSimTransactor(t)
-	simulatedBackend := backends.NewSimulatedBackend(core.GenesisAlloc{
-		transactor.From: {Balance: assets.Ether(1000).ToInt()},
-	}, 30e6)
-
-	// Deploy the contract
-	address, _, _, err := message_hasher.DeployMessageHasher(transactor, simulatedBackend)
-	require.NoError(t, err)
-	simulatedBackend.Commit()
-
-	// Setup contract client
-	contract, err := message_hasher.NewMessageHasher(address, simulatedBackend)
-	require.NoError(t, err)
-
-	return &testSetupData{
-		contractAddr: address,
-		contract:     contract,
-		sb:           simulatedBackend,
-		auth:         transactor,
-	}
-}
diff --git a/core/capabilities/ccip/common/common.go b/core/capabilities/ccip/common/common.go
deleted file mode 100644
index 6409345ed9..0000000000
--- a/core/capabilities/ccip/common/common.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package common
-
-import (
-	"fmt"
-
-	"github.com/ethereum/go-ethereum/crypto"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
-)
-
-// HashedCapabilityID returns the hashed capability id in a manner equivalent to the capability registry.
-func HashedCapabilityID(capabilityLabelledName, capabilityVersion string) (r [32]byte, err error) {
-	// TODO: investigate how to avoid parsing the ABI everytime.
-	tabi := `[{"type": "string"}, {"type": "string"}]`
-	abiEncoded, err := utils.ABIEncode(tabi, capabilityLabelledName, capabilityVersion)
-	if err != nil {
-		return r, fmt.Errorf("failed to ABI encode capability version and labelled name: %w", err)
-	}
-
-	h := crypto.Keccak256(abiEncoded)
-	copy(r[:], h)
-	return r, nil
-}
diff --git a/core/capabilities/ccip/common/common_test.go b/core/capabilities/ccip/common/common_test.go
deleted file mode 100644
index a7484a83ad..0000000000
--- a/core/capabilities/ccip/common/common_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package common_test
-
-import (
-	"testing"
-
-	capcommon "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-)
-
-func Test_HashedCapabilityId(t *testing.T) {
-	transactor := testutils.MustNewSimTransactor(t)
-	sb := backends.NewSimulatedBackend(core.GenesisAlloc{
-		transactor.From: {Balance: assets.Ether(1000).ToInt()},
-	}, 30e6)
-
-	crAddress, _, _, err := kcr.DeployCapabilitiesRegistry(transactor, sb)
-	require.NoError(t, err)
-	sb.Commit()
-
-	cr, err := kcr.NewCapabilitiesRegistry(crAddress, sb)
-	require.NoError(t, err)
-
-	// add a capability, ignore cap config for simplicity.
-	_, err = cr.AddCapabilities(transactor, []kcr.CapabilitiesRegistryCapability{
-		{
-			LabelledName:          "ccip",
-			Version:               "v1.0.0",
-			CapabilityType:        0,
-			ResponseType:          0,
-			ConfigurationContract: common.Address{},
-		},
-	})
-	require.NoError(t, err)
-	sb.Commit()
-
-	hidExpected, err := cr.GetHashedCapabilityId(nil, "ccip", "v1.0.0")
-	require.NoError(t, err)
-
-	hid, err := capcommon.HashedCapabilityID("ccip", "v1.0.0")
-	require.NoError(t, err)
-
-	require.Equal(t, hidExpected, hid)
-}
diff --git a/core/capabilities/ccip/configs/evm/chain_writer.go b/core/capabilities/ccip/configs/evm/chain_writer.go
deleted file mode 100644
index 6f8c4a1570..0000000000
--- a/core/capabilities/ccip/configs/evm/chain_writer.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package evm
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-
-	"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
-	"github.com/smartcontractkit/chainlink/v2/common/txmgr"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
-	evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
-)
-
-var (
-	offrampABI = evmtypes.MustGetABI(offramp.OffRampABI)
-)
-
-func MustChainWriterConfig(
-	fromAddress common.Address,
-	maxGasPrice *assets.Wei,
-	commitGasLimit,
-	execBatchGasLimit uint64,
-) []byte {
-	rawConfig := ChainWriterConfigRaw(fromAddress, maxGasPrice, commitGasLimit, execBatchGasLimit)
-	encoded, err := json.Marshal(rawConfig)
-	if err != nil {
-		panic(fmt.Errorf("failed to marshal ChainWriterConfig: %w", err))
-	}
-
-	return encoded
-}
-
-// ChainWriterConfigRaw returns a ChainWriterConfig that can be used to transmit commit and execute reports.
-func ChainWriterConfigRaw(
-	fromAddress common.Address,
-	maxGasPrice *assets.Wei,
-	commitGasLimit,
-	execBatchGasLimit uint64,
-) evmrelaytypes.ChainWriterConfig {
-	return evmrelaytypes.ChainWriterConfig{
-		Contracts: map[string]*evmrelaytypes.ContractConfig{
-			consts.ContractNameOffRamp: {
-				ContractABI: offramp.OffRampABI,
-				Configs: map[string]*evmrelaytypes.ChainWriterDefinition{
-					consts.MethodCommit: {
-						ChainSpecificName: mustGetMethodName("commit", offrampABI),
-						FromAddress:       fromAddress,
-						GasLimit:          commitGasLimit,
-					},
-					consts.MethodExecute: {
-						ChainSpecificName: mustGetMethodName("execute", offrampABI),
-						FromAddress:       fromAddress,
-						GasLimit:          execBatchGasLimit,
-					},
-				},
-			},
-		},
-		SendStrategy: txmgr.NewSendEveryStrategy(),
-		MaxGasPrice:  maxGasPrice,
-	}
-}
-
-// mustGetMethodName panics if the method name is not found in the provided ABI.
-func mustGetMethodName(name string, tabi abi.ABI) (methodName string) {
-	m, ok := tabi.Methods[name]
-	if !ok {
-		panic(fmt.Sprintf("missing method %s in the abi", name))
-	}
-	return m.Name
-}
diff --git a/core/capabilities/ccip/configs/evm/contract_reader.go b/core/capabilities/ccip/configs/evm/contract_reader.go
deleted file mode 100644
index 6774c8c1fe..0000000000
--- a/core/capabilities/ccip/configs/evm/contract_reader.go
+++ /dev/null
@@ -1,219 +0,0 @@
-package evm
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/ethereum/go-ethereum/accounts/abi"
-
-	"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
-
-	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry"
-	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-	evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
-)
-
-var (
-	onrampABI               = evmtypes.MustGetABI(onramp.OnRampABI)
-	capabilitiesRegsitryABI = evmtypes.MustGetABI(kcr.CapabilitiesRegistryABI)
-	ccipConfigABI           = evmtypes.MustGetABI(ccip_config.CCIPConfigABI)
-	priceRegistryABI        = evmtypes.MustGetABI(price_registry.PriceRegistryABI)
-)
-
-// MustSourceReaderConfig returns a ChainReaderConfig that can be used to read from the onramp.
-// The configuration is marshaled into JSON so that it can be passed to the relayer NewContractReader() method.
-func MustSourceReaderConfig() []byte {
-	rawConfig := SourceReaderConfig()
-	encoded, err := json.Marshal(rawConfig)
-	if err != nil {
-		panic(fmt.Errorf("failed to marshal ChainReaderConfig into JSON: %w", err))
-	}
-
-	return encoded
-}
-
-// MustDestReaderConfig returns a ChainReaderConfig that can be used to read from the offramp.
-// The configuration is marshaled into JSON so that it can be passed to the relayer NewContractReader() method.
-func MustDestReaderConfig() []byte {
-	rawConfig := DestReaderConfig()
-	encoded, err := json.Marshal(rawConfig)
-	if err != nil {
-		panic(fmt.Errorf("failed to marshal ChainReaderConfig into JSON: %w", err))
-	}
-
-	return encoded
-}
-
-// DestReaderConfig returns a ChainReaderConfig that can be used to read from the offramp.
-func DestReaderConfig() evmrelaytypes.ChainReaderConfig {
-	return evmrelaytypes.ChainReaderConfig{
-		Contracts: map[string]evmrelaytypes.ChainContractReader{
-			consts.ContractNameOffRamp: {
-				ContractABI: offramp.OffRampABI,
-				ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
-					GenericEventNames: []string{
-						mustGetEventName(consts.EventNameExecutionStateChanged, offrampABI),
-						mustGetEventName(consts.EventNameCommitReportAccepted, offrampABI),
-					},
-				},
-				Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
-					consts.MethodNameGetExecutionState: {
-						ChainSpecificName: mustGetMethodName("getExecutionState", offrampABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					consts.MethodNameGetMerkleRoot: {
-						ChainSpecificName: mustGetMethodName("getMerkleRoot", offrampABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					consts.MethodNameIsBlessed: {
-						ChainSpecificName: mustGetMethodName("isBlessed", offrampABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					consts.MethodNameGetLatestPriceSequenceNumber: {
-						ChainSpecificName: mustGetMethodName("getLatestPriceSequenceNumber", offrampABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					consts.MethodNameOfframpGetStaticConfig: {
-						ChainSpecificName: mustGetMethodName("getStaticConfig", offrampABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					consts.MethodNameOfframpGetDynamicConfig: {
-						ChainSpecificName: mustGetMethodName("getDynamicConfig", offrampABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					consts.MethodNameGetSourceChainConfig: {
-						ChainSpecificName: mustGetMethodName("getSourceChainConfig", offrampABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					consts.EventNameCommitReportAccepted: {
-						ChainSpecificName: mustGetEventName(consts.EventNameCommitReportAccepted, offrampABI),
-						ReadType:          evmrelaytypes.Event,
-					},
-					consts.EventNameExecutionStateChanged: {
-						ChainSpecificName: mustGetEventName(consts.EventNameExecutionStateChanged, offrampABI),
-						ReadType:          evmrelaytypes.Event,
-					},
-				},
-			},
-		},
-	}
-}
-
-// SourceReaderConfig returns a ChainReaderConfig that can be used to read from the onramp.
-func SourceReaderConfig() evmrelaytypes.ChainReaderConfig {
-	return evmrelaytypes.ChainReaderConfig{
-		Contracts: map[string]evmrelaytypes.ChainContractReader{
-			consts.ContractNameOnRamp: {
-				ContractABI: onramp.OnRampABI,
-				ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
-					GenericEventNames: []string{
-						mustGetEventName(consts.EventNameCCIPSendRequested, onrampABI),
-					},
-				},
-				Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
-					// all "{external|public} view" functions in the onramp except for getFee and getPoolBySourceToken are here.
-					// getFee is not expected to get called offchain and is only called by end-user contracts.
-					consts.MethodNameGetExpectedNextSequenceNumber: {
-						ChainSpecificName: mustGetMethodName("getExpectedNextSequenceNumber", onrampABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					consts.MethodNameOnrampGetStaticConfig: {
-						ChainSpecificName: mustGetMethodName("getStaticConfig", onrampABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					consts.MethodNameOnrampGetDynamicConfig: {
-						ChainSpecificName: mustGetMethodName("getDynamicConfig", onrampABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					consts.EventNameCCIPSendRequested: {
-						ChainSpecificName: mustGetEventName(consts.EventNameCCIPSendRequested, onrampABI),
-						ReadType:          evmrelaytypes.Event,
-						EventDefinitions: &evmrelaytypes.EventDefinitions{
-							GenericDataWordNames: map[string]uint8{
-								consts.EventAttributeSequenceNumber: 5,
-							},
-						},
-					},
-				},
-			},
-			consts.ContractNamePriceRegistry: {
-				ContractABI: price_registry.PriceRegistryABI,
-				Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
-					// TODO: update with the consts from https://github.com/smartcontractkit/chainlink-ccip/pull/39
-					// in a followup.
-					"GetStaticConfig": {
-						ChainSpecificName: mustGetMethodName("getStaticConfig", priceRegistryABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					"GetDestChainConfig": {
-						ChainSpecificName: mustGetMethodName("getDestChainConfig", priceRegistryABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					"GetPremiumMultiplierWeiPerEth": {
-						ChainSpecificName: mustGetMethodName("getPremiumMultiplierWeiPerEth", priceRegistryABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					"GetTokenTransferFeeConfig": {
-						ChainSpecificName: mustGetMethodName("getTokenTransferFeeConfig", priceRegistryABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					"ProcessMessageArgs": {
-						ChainSpecificName: mustGetMethodName("processMessageArgs", priceRegistryABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					"ValidatePoolReturnData": {
-						ChainSpecificName: mustGetMethodName("validatePoolReturnData", priceRegistryABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					"GetValidatedTokenPrice": {
-						ChainSpecificName: mustGetMethodName("getValidatedTokenPrice", priceRegistryABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-					"GetFeeTokens": {
-						ChainSpecificName: mustGetMethodName("getFeeTokens", priceRegistryABI),
-						ReadType:          evmrelaytypes.Method,
-					},
-				},
-			},
-		},
-	}
-}
-
-// HomeChainReaderConfigRaw returns a ChainReaderConfig that can be used to read from the home chain.
-func HomeChainReaderConfigRaw() evmrelaytypes.ChainReaderConfig {
-	return evmrelaytypes.ChainReaderConfig{
-		Contracts: map[string]evmrelaytypes.ChainContractReader{
-			consts.ContractNameCapabilitiesRegistry: {
-				ContractABI: kcr.CapabilitiesRegistryABI,
-				Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
-					consts.MethodNameGetCapability: {
-						ChainSpecificName: mustGetMethodName("getCapability", capabilitiesRegsitryABI),
-					},
-				},
-			},
-			consts.ContractNameCCIPConfig: {
-				ContractABI: ccip_config.CCIPConfigABI,
-				Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
-					consts.MethodNameGetAllChainConfigs: {
-						ChainSpecificName: mustGetMethodName("getAllChainConfigs", ccipConfigABI),
-					},
-					consts.MethodNameGetOCRConfig: {
-						ChainSpecificName: mustGetMethodName("getOCRConfig", ccipConfigABI),
-					},
-				},
-			},
-		},
-	}
-}
-
-func mustGetEventName(event string, tabi abi.ABI) string {
-	e, ok := tabi.Events[event]
-	if !ok {
-		panic(fmt.Sprintf("missing event %s in onrampABI", event))
-	}
-	return e.Name
-}
diff --git a/core/capabilities/ccip/delegate.go b/core/capabilities/ccip/delegate.go
deleted file mode 100644
index afa8152ea5..0000000000
--- a/core/capabilities/ccip/delegate.go
+++ /dev/null
@@ -1,296 +0,0 @@
-package ccip
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
-	configsevm "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/launcher"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/oraclecreator"
-
-	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
-
-	"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
-	ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
-	"github.com/smartcontractkit/chainlink-common/pkg/types"
-	"github.com/smartcontractkit/chainlink-common/pkg/types/query/primitives"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
-	"github.com/smartcontractkit/chainlink/v2/core/config"
-	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/job"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-	"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
-	"github.com/smartcontractkit/chainlink/v2/plugins"
-)
-
-type Delegate struct {
-	lggr                  logger.Logger
-	registrarConfig       plugins.RegistrarConfig
-	pipelineRunner        pipeline.Runner
-	chains                legacyevm.LegacyChainContainer
-	keystore              keystore.Master
-	ds                    sqlutil.DataSource
-	peerWrapper           *ocrcommon.SingletonPeerWrapper
-	monitoringEndpointGen telemetry.MonitoringEndpointGenerator
-	registrySyncer        registrysyncer.Syncer
-	capabilityConfig      config.Capabilities
-
-	isNewlyCreatedJob bool
-}
-
-func NewDelegate(
-	lggr logger.Logger,
-	registrarConfig plugins.RegistrarConfig,
-	pipelineRunner pipeline.Runner,
-	chains legacyevm.LegacyChainContainer,
-	registrySyncer registrysyncer.Syncer,
-	keystore keystore.Master,
-	ds sqlutil.DataSource,
-	peerWrapper *ocrcommon.SingletonPeerWrapper,
-	monitoringEndpointGen telemetry.MonitoringEndpointGenerator,
-	capabilityConfig config.Capabilities,
-) *Delegate {
-	return &Delegate{
-		lggr:                  lggr,
-		registrarConfig:       registrarConfig,
-		pipelineRunner:        pipelineRunner,
-		chains:                chains,
-		registrySyncer:        registrySyncer,
-		ds:                    ds,
-		keystore:              keystore,
-		peerWrapper:           peerWrapper,
-		monitoringEndpointGen: monitoringEndpointGen,
-		capabilityConfig:      capabilityConfig,
-	}
-}
-
-func (d *Delegate) JobType() job.Type {
-	return job.CCIP
-}
-
-func (d *Delegate) BeforeJobCreated(job.Job) {
-	// This is only called first time the job is created
-	d.isNewlyCreatedJob = true
-}
-
-func (d *Delegate) ServicesForSpec(ctx context.Context, spec job.Job) (services []job.ServiceCtx, err error) {
-	// In general there should only be one P2P key but the node may have multiple.
-	// The job spec should specify the correct P2P key to use.
-	peerID, err := p2pkey.MakePeerID(spec.CCIPSpec.P2PKeyID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to make peer ID from provided spec p2p id (%s): %w", spec.CCIPSpec.P2PKeyID, err)
-	}
-
-	p2pID, err := d.keystore.P2P().Get(peerID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get all p2p keys: %w", err)
-	}
-
-	ocrKeys, err := d.getOCRKeys(spec.CCIPSpec.OCRKeyBundleIDs)
-	if err != nil {
-		return nil, err
-	}
-
-	transmitterKeys, err := d.getTransmitterKeys(ctx, d.chains)
-	if err != nil {
-		return nil, err
-	}
-
-	bootstrapperLocators, err := ocrcommon.ParseBootstrapPeers(spec.CCIPSpec.P2PV2Bootstrappers)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse bootstrapper locators: %w", err)
-	}
-
-	// NOTE: we can use the same DB for all plugin instances,
-	// since all queries are scoped by config digest.
-	ocrDB := ocr2.NewDB(d.ds, spec.ID, 0, d.lggr)
-
-	homeChainContractReader, ccipConfigBinding, err := d.getHomeChainContractReader(
-		ctx,
-		d.chains,
-		spec.CCIPSpec.CapabilityLabelledName,
-		spec.CCIPSpec.CapabilityVersion)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get home chain contract reader: %w", err)
-	}
-
-	hcr := ccipreaderpkg.NewHomeChainReader(
-		homeChainContractReader,
-		d.lggr.Named("HomeChainReader"),
-		100*time.Millisecond,
-		ccipConfigBinding,
-	)
-
-	oracleCreator := oraclecreator.New(
-		ocrKeys,
-		transmitterKeys,
-		d.chains,
-		d.peerWrapper,
-		spec.ExternalJobID,
-		spec.ID,
-		d.isNewlyCreatedJob,
-		spec.CCIPSpec.PluginConfig,
-		ocrDB,
-		d.lggr,
-		d.monitoringEndpointGen,
-		bootstrapperLocators,
-		hcr,
-	)
-
-	capLauncher := launcher.New(
-		spec.CCIPSpec.CapabilityVersion,
-		spec.CCIPSpec.CapabilityLabelledName,
-		ragep2ptypes.PeerID(p2pID.PeerID()),
-		d.lggr,
-		hcr,
-		oracleCreator,
-		12*time.Second,
-	)
-
-	// register the capability launcher with the registry syncer
-	d.registrySyncer.AddLauncher(capLauncher)
-
-	return []job.ServiceCtx{
-		hcr,
-		capLauncher,
-	}, nil
-}
-
-func (d *Delegate) AfterJobCreated(spec job.Job) {}
-
-func (d *Delegate) BeforeJobDeleted(spec job.Job) {}
-
-func (d *Delegate) OnDeleteJob(ctx context.Context, spec job.Job) error {
-	// TODO: shut down needed services?
-	return nil
-}
-
-func (d *Delegate) getOCRKeys(ocrKeyBundleIDs job.JSONConfig) (map[string]ocr2key.KeyBundle, error) {
-	ocrKeys := make(map[string]ocr2key.KeyBundle)
-	for networkType, bundleIDRaw := range ocrKeyBundleIDs {
-		if networkType != relay.NetworkEVM {
-			return nil, fmt.Errorf("unsupported chain type: %s", networkType)
-		}
-
-		bundleID, ok := bundleIDRaw.(string)
-		if !ok {
-			return nil, fmt.Errorf("OCRKeyBundleIDs must be a map of chain types to OCR key bundle IDs, got: %T", bundleIDRaw)
-		}
-
-		bundle, err2 := d.keystore.OCR2().Get(bundleID)
-		if err2 != nil {
-			return nil, fmt.Errorf("OCR key bundle with ID %s not found: %w", bundleID, err2)
-		}
-
-		ocrKeys[networkType] = bundle
-	}
-	return ocrKeys, nil
-}
-
-func (d *Delegate) getTransmitterKeys(ctx context.Context, chains legacyevm.LegacyChainContainer) (map[types.RelayID][]string, error) {
-	transmitterKeys := make(map[types.RelayID][]string)
-	for _, chain := range chains.Slice() {
-		relayID := types.NewRelayID(relay.NetworkEVM, chain.ID().String())
-		ethKeys, err2 := d.keystore.Eth().EnabledAddressesForChain(ctx, chain.ID())
-		if err2 != nil {
-			return nil, fmt.Errorf("error getting enabled addresses for chain: %s %w", chain.ID().String(), err2)
-		}
-
-		transmitterKeys[relayID] = func() (r []string) {
-			for _, key := range ethKeys {
-				r = append(r, key.Hex())
-			}
-			return
-		}()
-	}
-	return transmitterKeys, nil
-}
-
-func (d *Delegate) getHomeChainContractReader(
-	ctx context.Context,
-	chains legacyevm.LegacyChainContainer,
-	capabilityLabelledName,
-	capabilityVersion string,
-) (types.ContractReader, types.BoundContract, error) {
-	// home chain is where the capability registry is deployed,
-	// which should be set correctly in toml config.
-	homeChainRelayID := d.capabilityConfig.ExternalRegistry().RelayID()
-	homeChain, err := chains.Get(homeChainRelayID.ChainID)
-	if err != nil {
-		return nil, types.BoundContract{}, fmt.Errorf("home chain relayer not found, chain id: %s, err: %w", homeChainRelayID.String(), err)
-	}
-
-	reader, err := evm.NewChainReaderService(
-		context.Background(),
-		d.lggr,
-		homeChain.LogPoller(),
-		homeChain.HeadTracker(),
-		homeChain.Client(),
-		configsevm.HomeChainReaderConfigRaw(),
-	)
-	if err != nil {
-		return nil, types.BoundContract{}, fmt.Errorf("failed to create home chain contract reader: %w", err)
-	}
-
-	reader, ccipConfigBinding, err := bindReader(ctx, reader, d.capabilityConfig.ExternalRegistry().Address(), capabilityLabelledName, capabilityVersion)
-	if err != nil {
-		return nil, types.BoundContract{}, fmt.Errorf("failed to bind home chain contract reader: %w", err)
-	}
-
-	return reader, ccipConfigBinding, nil
-}
-
-func bindReader(ctx context.Context,
-	reader types.ContractReader,
-	capRegAddress,
-	capabilityLabelledName,
-	capabilityVersion string,
-) (boundReader types.ContractReader, ccipConfigBinding types.BoundContract, err error) {
-	err = reader.Bind(ctx, []types.BoundContract{
-		{
-			Address: capRegAddress,
-			Name:    consts.ContractNameCapabilitiesRegistry,
-		},
-	})
-	if err != nil {
-		return nil, types.BoundContract{}, fmt.Errorf("failed to bind home chain contract reader: %w", err)
-	}
-
-	hid, err := common.HashedCapabilityID(capabilityLabelledName, capabilityVersion)
-	if err != nil {
-		return nil, types.BoundContract{}, fmt.Errorf("failed to hash capability id: %w", err)
-	}
-
-	var ccipCapabilityInfo kcr.CapabilitiesRegistryCapabilityInfo
-	err = reader.GetLatestValue(ctx, consts.ContractNameCapabilitiesRegistry, consts.MethodNameGetCapability, primitives.Unconfirmed, map[string]any{
-		"hashedId": hid,
-	}, &ccipCapabilityInfo)
-	if err != nil {
-		return nil, types.BoundContract{}, fmt.Errorf("failed to get CCIP capability info from chain reader: %w", err)
-	}
-
-	// bind the ccip capability configuration contract
-	ccipConfigBinding = types.BoundContract{
-		Address: ccipCapabilityInfo.ConfigurationContract.String(),
-		Name:    consts.ContractNameCCIPConfig,
-	}
-	err = reader.Bind(ctx, []types.BoundContract{ccipConfigBinding})
-	if err != nil {
-		return nil, types.BoundContract{}, fmt.Errorf("failed to bind CCIP capability configuration contract: %w", err)
-	}
-
-	return reader, ccipConfigBinding, nil
-}
diff --git a/core/capabilities/ccip/delegate_test.go b/core/capabilities/ccip/delegate_test.go
deleted file mode 100644
index dd8a5124b5..0000000000
--- a/core/capabilities/ccip/delegate_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package ccip
diff --git a/core/capabilities/ccip/launcher/README.md b/core/capabilities/ccip/launcher/README.md
deleted file mode 100644
index 41fbecfdbd..0000000000
--- a/core/capabilities/ccip/launcher/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# CCIP Capability Launcher
-
-The CCIP capability launcher is responsible for listening to
-[Capabilities Registry](../../../../contracts/src/v0.8/keystone/CapabilitiesRegistry.sol) (CR) updates
-for the particular CCIP capability (labelled name, version) pair and reacting to them. In
-particular, there are three kinds of events that would affect a particular capability:
-
-1. DON Creation: when `addDON` is called on the CR, the capabilities of this new DON are specified.
-If CCIP is one of those capabilities, the launcher will launch a commit and an execution plugin
-with the OCR configuration specified in the DON creation process. See
-[Types.sol](../../../../contracts/src/v0.8/ccip/capability/libraries/Types.sol) for more details
-on what the OCR configuration contains.
-2. DON update: when `updateDON` is called on the CR, capabilities of the DON can be updated. In the
-CCIP use case specifically, `updateDON` is used to update OCR configuration of that DON. Updates
-follow the blue/green deployment pattern (explained in detail below with a state diagram). In this
-scenario the launcher must either launch brand new instances of the commit and execution plugins
-(in the event a green deployment is made) or promote the currently running green instance to be
-the blue instance.
-3. DON deletion: when `deleteDON` is called on the CR, the launcher must shut down all running plugins
-related to that DON. When a DON is deleted it effectively means that it should no longer function.
-DON deletion is permanent.
-
-## Architecture Diagram
-
-![CCIP Capability Launcher](ccip_capability_launcher.png)
-
-The above diagram shows how the CCIP capability launcher interacts with the rest of the components
-in the CCIP system.
-
-The CCIP capability job, which is created on the Chainlink node, will spin up the CCIP capability
-launcher alongside the home chain reader, which reads the [CCIPConfig.sol](../../../../contracts/src/v0.8/ccip/capability/CCIPConfig.sol)
-contract deployed on the home chain (typically Ethereum Mainnet, though could be "any chain" in theory).
-
-Injected into the launcher is the [OracleCreator](../types/types.go) object which knows how to spin up CCIP
-oracles (both bootstrap and plugin oracles). This is used by the launcher at the appropriate time in order
-to create oracle instances but not start them right away.
-
-After all the required oracles have been created, the launcher will start and shut them down as required
-in order to match the configuration that was posted on-chain in the CR and the CCIPConfig.sol contract.
-
-
-## Config State Diagram
-
-![CCIP Config State Machine](ccip_config_state_machine.png)
-
-CCIP's blue/green deployment paradigm is intentionally kept as simple as possible.
-
-Every CCIP DON starts in the `Init` state. Upon DON creation, which must provide a valid OCR
-configuration, the CCIP DON will move into the `Running` state. In this state, the DON is
-presumed to be fully functional from a configuration standpoint.
-
-When we want to update configuration, we propose a new configuration to the CR that consists of
-an array of two OCR configurations:
-
-1. The first element of the array is the current OCR configuration that is running (termed "blue").
-2. The second element of the array is the future OCR configuration that we want to run (termed "green").
-
-Various checks are done on-chain in order to validate this particular state transition, in particular,
-related to config counts. Doing this will move the state of the configuration to the `Staging` state.
-
-In the `Staging` state, there are effectively four plugins running - one (commit, execution) pair for the
-blue configuration, and one (commit, execution) pair for the green configuration. However, only the blue
-configuration will actually be writing on-chain, where as the green configuration will be "dry running",
-i.e doing everything except transmitting.
-
-This allows us to test out new configurations without committing to them immediately.
-
-Finally, from the `Staging` state, there is only one transition, which is to promote the green configuration
-to be the new blue configuration, and go back into the `Running` state.
diff --git a/core/capabilities/ccip/launcher/bluegreen.go b/core/capabilities/ccip/launcher/bluegreen.go
deleted file mode 100644
index 6245846629..0000000000
--- a/core/capabilities/ccip/launcher/bluegreen.go
+++ /dev/null
@@ -1,178 +0,0 @@
-package launcher
-
-import (
-	"fmt"
-
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-
-	"go.uber.org/multierr"
-
-	ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-)
-
-// blueGreenDeployment represents a blue-green deployment of OCR instances.
-type blueGreenDeployment struct {
-	// blue is the blue OCR instance.
-	// blue must always be present.
-	blue cctypes.CCIPOracle
-
-	// bootstrapBlue is the bootstrap node of the blue OCR instance.
-	// Only a subset of the DON will be running bootstrap instances,
-	// so this may be nil.
-	bootstrapBlue cctypes.CCIPOracle
-
-	// green is the green OCR instance.
-	// green may or may not be present.
-	// green must never be present if blue is not present.
-	// TODO: should we enforce this invariant somehow?
-	green cctypes.CCIPOracle
-
-	// bootstrapGreen is the bootstrap node of the green OCR instance.
-	// Only a subset of the DON will be running bootstrap instances,
-	// so this may be nil, even when green is not nil.
-	bootstrapGreen cctypes.CCIPOracle
-}
-
-// ccipDeployment represents blue-green deployments of both commit and exec
-// OCR instances.
-type ccipDeployment struct {
-	commit blueGreenDeployment
-	exec   blueGreenDeployment
-}
-
-// Close shuts down all OCR instances in the deployment.
-func (c *ccipDeployment) Close() error {
-	var err error
-
-	// shutdown blue commit instances.
-	err = multierr.Append(err, c.commit.blue.Close())
-	if c.commit.bootstrapBlue != nil {
-		err = multierr.Append(err, c.commit.bootstrapBlue.Close())
-	}
-
-	// shutdown green commit instances.
-	if c.commit.green != nil {
-		err = multierr.Append(err, c.commit.green.Close())
-	}
-	if c.commit.bootstrapGreen != nil {
-		err = multierr.Append(err, c.commit.bootstrapGreen.Close())
-	}
-
-	// shutdown blue exec instances.
-	err = multierr.Append(err, c.exec.blue.Close())
-	if c.exec.bootstrapBlue != nil {
-		err = multierr.Append(err, c.exec.bootstrapBlue.Close())
-	}
-
-	// shutdown green exec instances.
-	if c.exec.green != nil {
-		err = multierr.Append(err, c.exec.green.Close())
-	}
-	if c.exec.bootstrapGreen != nil {
-		err = multierr.Append(err, c.exec.bootstrapGreen.Close())
-	}
-
-	return err
-}
-
-// StartBlue starts the blue OCR instances.
-func (c *ccipDeployment) StartBlue() error {
-	var err error
-
-	err = multierr.Append(err, c.commit.blue.Start())
-	if c.commit.bootstrapBlue != nil {
-		err = multierr.Append(err, c.commit.bootstrapBlue.Start())
-	}
-	err = multierr.Append(err, c.exec.blue.Start())
-	if c.exec.bootstrapBlue != nil {
-		err = multierr.Append(err, c.exec.bootstrapBlue.Start())
-	}
-
-	return err
-}
-
-// CloseBlue shuts down the blue OCR instances.
-func (c *ccipDeployment) CloseBlue() error {
-	var err error
-
-	err = multierr.Append(err, c.commit.blue.Close())
-	if c.commit.bootstrapBlue != nil {
-		err = multierr.Append(err, c.commit.bootstrapBlue.Close())
-	}
-	err = multierr.Append(err, c.exec.blue.Close())
-	if c.exec.bootstrapBlue != nil {
-		err = multierr.Append(err, c.exec.bootstrapBlue.Close())
-	}
-
-	return err
-}
-
-// HandleBlueGreen handles the blue-green deployment transition.
-// prevDeployment is the previous deployment state.
-// there are two possible cases:
-//
-// 1. both blue and green are present in prevDeployment, but only blue is present in c.
-// this is a promotion of green to blue, so we need to shut down the blue deployment
-// and make green the new blue. In this case green is already running, so there's no
-// need to start it. However, we need to shut down the blue deployment.
-//
-// 2. only blue is present in prevDeployment, both blue and green are present in c.
-// In this case, blue is already running, so there's no need to start it. We need to
-// start green.
-func (c *ccipDeployment) HandleBlueGreen(prevDeployment *ccipDeployment) error {
-	if prevDeployment == nil {
-		return fmt.Errorf("previous deployment is nil")
-	}
-
-	var err error
-	if prevDeployment.commit.green != nil && c.commit.green == nil {
-		err = multierr.Append(err, prevDeployment.commit.blue.Close())
-		if prevDeployment.commit.bootstrapBlue != nil {
-			err = multierr.Append(err, prevDeployment.commit.bootstrapBlue.Close())
-		}
-	} else if prevDeployment.commit.green == nil && c.commit.green != nil {
-		err = multierr.Append(err, c.commit.green.Start())
-		if c.commit.bootstrapGreen != nil {
-			err = multierr.Append(err, c.commit.bootstrapGreen.Start())
-		}
-	} else {
-		return fmt.Errorf("invalid blue-green deployment transition")
-	}
-
-	if prevDeployment.exec.green != nil && c.exec.green == nil {
-		err = multierr.Append(err, prevDeployment.exec.blue.Close())
-		if prevDeployment.exec.bootstrapBlue != nil {
-			err = multierr.Append(err, prevDeployment.exec.bootstrapBlue.Close())
-		}
-	} else if prevDeployment.exec.green == nil && c.exec.green != nil {
-		err = multierr.Append(err, c.exec.green.Start())
-		if c.exec.bootstrapGreen != nil {
-			err = multierr.Append(err, c.exec.bootstrapGreen.Start())
-		}
-	} else {
-		return fmt.Errorf("invalid blue-green deployment transition")
-	}
-
-	return err
-}
-
-// HasGreenInstance returns true if the deployment has a green instance for the
-// given plugin type.
-func (c *ccipDeployment) HasGreenInstance(pluginType cctypes.PluginType) bool {
-	switch pluginType {
-	case cctypes.PluginTypeCCIPCommit:
-		return c.commit.green != nil
-	case cctypes.PluginTypeCCIPExec:
-		return c.exec.green != nil
-	default:
-		return false
-	}
-}
-
-func isNewGreenInstance(pluginType cctypes.PluginType, ocrConfigs []ccipreaderpkg.OCR3ConfigWithMeta, prevDeployment ccipDeployment) bool {
-	return len(ocrConfigs) == 2 && !prevDeployment.HasGreenInstance(pluginType)
-}
-
-func isPromotion(pluginType cctypes.PluginType, ocrConfigs []ccipreaderpkg.OCR3ConfigWithMeta, prevDeployment ccipDeployment) bool {
-	return len(ocrConfigs) == 1 && prevDeployment.HasGreenInstance(pluginType)
-}
diff --git a/core/capabilities/ccip/launcher/bluegreen_test.go b/core/capabilities/ccip/launcher/bluegreen_test.go
deleted file mode 100644
index 9fd71a0cb4..0000000000
--- a/core/capabilities/ccip/launcher/bluegreen_test.go
+++ /dev/null
@@ -1,1043 +0,0 @@
-package launcher
-
-import (
-	"errors"
-	"testing"
-
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-	mocktypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types/mocks"
-
-	"github.com/stretchr/testify/require"
-
-	ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-)
-
-func Test_ccipDeployment_Close(t *testing.T) {
-	type args struct {
-		commitBlue           *mocktypes.CCIPOracle
-		commitBlueBootstrap  *mocktypes.CCIPOracle
-		commitGreen          *mocktypes.CCIPOracle
-		commitGreenBootstrap *mocktypes.CCIPOracle
-		execBlue             *mocktypes.CCIPOracle
-		execBlueBootstrap    *mocktypes.CCIPOracle
-		execGreen            *mocktypes.CCIPOracle
-		execGreenBootstrap   *mocktypes.CCIPOracle
-	}
-	tests := []struct {
-		name    string
-		args    args
-		expect  func(t *testing.T, args args)
-		asserts func(t *testing.T, args args)
-		wantErr bool
-	}{
-		{
-			name: "no errors, blue only",
-			args: args{
-				commitBlue:           mocktypes.NewCCIPOracle(t),
-				commitGreen:          nil,
-				commitGreenBootstrap: nil,
-				execBlue:             mocktypes.NewCCIPOracle(t),
-				execGreen:            nil,
-				execGreenBootstrap:   nil,
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(nil).Once()
-				args.execBlue.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "no errors, blue and green",
-			args: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: mocktypes.NewCCIPOracle(t),
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(nil).Once()
-				args.commitGreen.On("Close").Return(nil).Once()
-				args.execBlue.On("Close").Return(nil).Once()
-				args.execGreen.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.commitGreen.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-				args.execGreen.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "error on commit blue",
-			args: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: nil,
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   nil,
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(errors.New("failed")).Once()
-				args.execBlue.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-		{
-			name: "bootstrap blue also closed",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(nil).Once()
-				args.commitBlueBootstrap.On("Close").Return(nil).Once()
-				args.execBlue.On("Close").Return(nil).Once()
-				args.execBlueBootstrap.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.commitBlueBootstrap.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-				args.execBlueBootstrap.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "bootstrap green also closed",
-			args: args{
-				commitBlue:           mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap:  mocktypes.NewCCIPOracle(t),
-				commitGreen:          mocktypes.NewCCIPOracle(t),
-				commitGreenBootstrap: mocktypes.NewCCIPOracle(t),
-				execBlue:             mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:    mocktypes.NewCCIPOracle(t),
-				execGreen:            mocktypes.NewCCIPOracle(t),
-				execGreenBootstrap:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(nil).Once()
-				args.commitBlueBootstrap.On("Close").Return(nil).Once()
-				args.commitGreen.On("Close").Return(nil).Once()
-				args.commitGreenBootstrap.On("Close").Return(nil).Once()
-				args.execBlue.On("Close").Return(nil).Once()
-				args.execBlueBootstrap.On("Close").Return(nil).Once()
-				args.execGreen.On("Close").Return(nil).Once()
-				args.execGreenBootstrap.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.commitBlueBootstrap.AssertExpectations(t)
-				args.commitGreen.AssertExpectations(t)
-				args.commitGreenBootstrap.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-				args.execBlueBootstrap.AssertExpectations(t)
-				args.execGreen.AssertExpectations(t)
-				args.execGreenBootstrap.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := &ccipDeployment{
-				commit: blueGreenDeployment{
-					blue: tt.args.commitBlue,
-				},
-				exec: blueGreenDeployment{
-					blue: tt.args.execBlue,
-				},
-			}
-			if tt.args.commitGreen != nil {
-				c.commit.green = tt.args.commitGreen
-			}
-			if tt.args.commitBlueBootstrap != nil {
-				c.commit.bootstrapBlue = tt.args.commitBlueBootstrap
-			}
-			if tt.args.commitGreenBootstrap != nil {
-				c.commit.bootstrapGreen = tt.args.commitGreenBootstrap
-			}
-
-			if tt.args.execGreen != nil {
-				c.exec.green = tt.args.execGreen
-			}
-			if tt.args.execBlueBootstrap != nil {
-				c.exec.bootstrapBlue = tt.args.execBlueBootstrap
-			}
-			if tt.args.execGreenBootstrap != nil {
-				c.exec.bootstrapGreen = tt.args.execGreenBootstrap
-			}
-
-			tt.expect(t, tt.args)
-			defer tt.asserts(t, tt.args)
-			err := c.Close()
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func Test_ccipDeployment_StartBlue(t *testing.T) {
-	type args struct {
-		commitBlue          *mocktypes.CCIPOracle
-		commitBlueBootstrap *mocktypes.CCIPOracle
-		execBlue            *mocktypes.CCIPOracle
-		execBlueBootstrap   *mocktypes.CCIPOracle
-	}
-	tests := []struct {
-		name    string
-		args    args
-		expect  func(t *testing.T, args args)
-		asserts func(t *testing.T, args args)
-		wantErr bool
-	}{
-		{
-			name: "no errors, no bootstrap",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: nil,
-				execBlueBootstrap:   nil,
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Start").Return(nil).Once()
-				args.execBlue.On("Start").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "no errors, with bootstrap",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Start").Return(nil).Once()
-				args.commitBlueBootstrap.On("Start").Return(nil).Once()
-				args.execBlue.On("Start").Return(nil).Once()
-				args.execBlueBootstrap.On("Start").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.commitBlueBootstrap.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-				args.execBlueBootstrap.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "error on commit blue",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: nil,
-				execBlueBootstrap:   nil,
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Start").Return(errors.New("failed")).Once()
-				args.execBlue.On("Start").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-		{
-			name: "error on exec blue",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: nil,
-				execBlueBootstrap:   nil,
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Start").Return(nil).Once()
-				args.execBlue.On("Start").Return(errors.New("failed")).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-		{
-			name: "error on commit blue bootstrap",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:   nil,
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Start").Return(nil).Once()
-				args.commitBlueBootstrap.On("Start").Return(errors.New("failed")).Once()
-				args.execBlue.On("Start").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.commitBlueBootstrap.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-		{
-			name: "error on exec blue bootstrap",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: nil,
-				execBlueBootstrap:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Start").Return(nil).Once()
-				args.execBlue.On("Start").Return(nil).Once()
-				args.execBlueBootstrap.On("Start").Return(errors.New("failed")).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-				args.execBlueBootstrap.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := &ccipDeployment{
-				commit: blueGreenDeployment{
-					blue: tt.args.commitBlue,
-				},
-				exec: blueGreenDeployment{
-					blue: tt.args.execBlue,
-				},
-			}
-			if tt.args.commitBlueBootstrap != nil {
-				c.commit.bootstrapBlue = tt.args.commitBlueBootstrap
-			}
-			if tt.args.execBlueBootstrap != nil {
-				c.exec.bootstrapBlue = tt.args.execBlueBootstrap
-			}
-
-			tt.expect(t, tt.args)
-			defer tt.asserts(t, tt.args)
-			err := c.StartBlue()
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func Test_ccipDeployment_CloseBlue(t *testing.T) {
-	type args struct {
-		commitBlue          *mocktypes.CCIPOracle
-		commitBlueBootstrap *mocktypes.CCIPOracle
-		execBlue            *mocktypes.CCIPOracle
-		execBlueBootstrap   *mocktypes.CCIPOracle
-	}
-	tests := []struct {
-		name    string
-		args    args
-		expect  func(t *testing.T, args args)
-		asserts func(t *testing.T, args args)
-		wantErr bool
-	}{
-		{
-			name: "no errors, no bootstrap",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: nil,
-				execBlueBootstrap:   nil,
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(nil).Once()
-				args.execBlue.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "no errors, with bootstrap",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(nil).Once()
-				args.commitBlueBootstrap.On("Close").Return(nil).Once()
-				args.execBlue.On("Close").Return(nil).Once()
-				args.execBlueBootstrap.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.commitBlueBootstrap.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-				args.execBlueBootstrap.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "error on commit blue",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: nil,
-				execBlueBootstrap:   nil,
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(errors.New("failed")).Once()
-				args.execBlue.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-		{
-			name: "error on exec blue",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: nil,
-				execBlueBootstrap:   nil,
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(nil).Once()
-				args.execBlue.On("Close").Return(errors.New("failed")).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-		{
-			name: "error on commit blue bootstrap",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:   nil,
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(nil).Once()
-				args.commitBlueBootstrap.On("Close").Return(errors.New("failed")).Once()
-				args.execBlue.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.commitBlueBootstrap.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-		{
-			name: "error on exec blue bootstrap",
-			args: args{
-				commitBlue:          mocktypes.NewCCIPOracle(t),
-				execBlue:            mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap: nil,
-				execBlueBootstrap:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args) {
-				args.commitBlue.On("Close").Return(nil).Once()
-				args.execBlue.On("Close").Return(nil).Once()
-				args.execBlueBootstrap.On("Close").Return(errors.New("failed")).Once()
-			},
-			asserts: func(t *testing.T, args args) {
-				args.commitBlue.AssertExpectations(t)
-				args.execBlue.AssertExpectations(t)
-				args.execBlueBootstrap.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := &ccipDeployment{
-				commit: blueGreenDeployment{
-					blue: tt.args.commitBlue,
-				},
-				exec: blueGreenDeployment{
-					blue: tt.args.execBlue,
-				},
-			}
-			if tt.args.commitBlueBootstrap != nil {
-				c.commit.bootstrapBlue = tt.args.commitBlueBootstrap
-			}
-			if tt.args.execBlueBootstrap != nil {
-				c.exec.bootstrapBlue = tt.args.execBlueBootstrap
-			}
-
-			tt.expect(t, tt.args)
-			defer tt.asserts(t, tt.args)
-			err := c.CloseBlue()
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func Test_ccipDeployment_HandleBlueGreen_PrevDeploymentNil(t *testing.T) {
-	require.Error(t, (&ccipDeployment{}).HandleBlueGreen(nil))
-}
-
-func Test_ccipDeployment_HandleBlueGreen(t *testing.T) {
-	type args struct {
-		commitBlue           *mocktypes.CCIPOracle
-		commitBlueBootstrap  *mocktypes.CCIPOracle
-		commitGreen          *mocktypes.CCIPOracle
-		commitGreenBootstrap *mocktypes.CCIPOracle
-		execBlue             *mocktypes.CCIPOracle
-		execBlueBootstrap    *mocktypes.CCIPOracle
-		execGreen            *mocktypes.CCIPOracle
-		execGreenBootstrap   *mocktypes.CCIPOracle
-	}
-	tests := []struct {
-		name                 string
-		argsPrevDeployment   args
-		argsFutureDeployment args
-		expect               func(t *testing.T, args args, argsPrevDeployment args)
-		asserts              func(t *testing.T, args args, argsPrevDeployment args)
-		wantErr              bool
-	}{
-		{
-			name: "promotion blue to green, no bootstrap",
-			argsPrevDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: mocktypes.NewCCIPOracle(t),
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   mocktypes.NewCCIPOracle(t),
-			},
-			argsFutureDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: nil,
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   nil,
-			},
-			expect: func(t *testing.T, args args, argsPrevDeployment args) {
-				argsPrevDeployment.commitBlue.On("Close").Return(nil).Once()
-				argsPrevDeployment.execBlue.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args, argsPrevDeployment args) {
-				argsPrevDeployment.commitBlue.AssertExpectations(t)
-				argsPrevDeployment.execBlue.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "promotion blue to green, with bootstrap",
-			argsPrevDeployment: args{
-				commitBlue:           mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap:  mocktypes.NewCCIPOracle(t),
-				commitGreen:          mocktypes.NewCCIPOracle(t),
-				commitGreenBootstrap: mocktypes.NewCCIPOracle(t),
-				execBlue:             mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:    mocktypes.NewCCIPOracle(t),
-				execGreen:            mocktypes.NewCCIPOracle(t),
-				execGreenBootstrap:   mocktypes.NewCCIPOracle(t),
-			},
-			argsFutureDeployment: args{
-				commitBlue:           mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap:  mocktypes.NewCCIPOracle(t),
-				commitGreen:          nil,
-				commitGreenBootstrap: nil,
-				execBlue:             mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:    mocktypes.NewCCIPOracle(t),
-				execGreen:            nil,
-				execGreenBootstrap:   nil,
-			},
-			expect: func(t *testing.T, args args, argsPrevDeployment args) {
-				argsPrevDeployment.commitBlue.On("Close").Return(nil).Once()
-				argsPrevDeployment.commitBlueBootstrap.On("Close").Return(nil).Once()
-				argsPrevDeployment.execBlue.On("Close").Return(nil).Once()
-				argsPrevDeployment.execBlueBootstrap.On("Close").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args, argsPrevDeployment args) {
-				argsPrevDeployment.commitBlue.AssertExpectations(t)
-				argsPrevDeployment.commitBlueBootstrap.AssertExpectations(t)
-				argsPrevDeployment.execBlue.AssertExpectations(t)
-				argsPrevDeployment.execBlueBootstrap.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "new green deployment, no bootstrap",
-			argsPrevDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: nil,
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   nil,
-			},
-			argsFutureDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: mocktypes.NewCCIPOracle(t),
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.On("Start").Return(nil).Once()
-				args.execGreen.On("Start").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.AssertExpectations(t)
-				args.execGreen.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "new green deployment, with bootstrap",
-			argsPrevDeployment: args{
-				commitBlue:           mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap:  mocktypes.NewCCIPOracle(t),
-				commitGreen:          nil,
-				commitGreenBootstrap: nil,
-				execBlue:             mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:    mocktypes.NewCCIPOracle(t),
-				execGreen:            nil,
-				execGreenBootstrap:   nil,
-			},
-			argsFutureDeployment: args{
-				commitBlue:           mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap:  mocktypes.NewCCIPOracle(t),
-				commitGreen:          mocktypes.NewCCIPOracle(t),
-				commitGreenBootstrap: mocktypes.NewCCIPOracle(t),
-				execBlue:             mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:    mocktypes.NewCCIPOracle(t),
-				execGreen:            mocktypes.NewCCIPOracle(t),
-				execGreenBootstrap:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.On("Start").Return(nil).Once()
-				args.commitGreenBootstrap.On("Start").Return(nil).Once()
-				args.execGreen.On("Start").Return(nil).Once()
-				args.execGreenBootstrap.On("Start").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.AssertExpectations(t)
-				args.commitGreenBootstrap.AssertExpectations(t)
-				args.execGreen.AssertExpectations(t)
-				args.execGreenBootstrap.AssertExpectations(t)
-			},
-			wantErr: false,
-		},
-		{
-			name: "error on commit green start",
-			argsPrevDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: nil,
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   nil,
-			},
-			argsFutureDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: mocktypes.NewCCIPOracle(t),
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.On("Start").Return(errors.New("failed")).Once()
-				args.execGreen.On("Start").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.AssertExpectations(t)
-				args.execGreen.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-		{
-			name: "error on exec green start",
-			argsPrevDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: nil,
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   nil,
-			},
-			argsFutureDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: mocktypes.NewCCIPOracle(t),
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.On("Start").Return(nil).Once()
-				args.execGreen.On("Start").Return(errors.New("failed")).Once()
-			},
-			asserts: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.AssertExpectations(t)
-				args.execGreen.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-		{
-			name: "error on commit green bootstrap start",
-			argsPrevDeployment: args{
-				commitBlue:           mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap:  mocktypes.NewCCIPOracle(t),
-				commitGreen:          nil,
-				commitGreenBootstrap: nil,
-				execBlue:             mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:    mocktypes.NewCCIPOracle(t),
-				execGreen:            nil,
-				execGreenBootstrap:   nil,
-			},
-			argsFutureDeployment: args{
-				commitBlue:           mocktypes.NewCCIPOracle(t),
-				commitBlueBootstrap:  mocktypes.NewCCIPOracle(t),
-				commitGreen:          mocktypes.NewCCIPOracle(t),
-				commitGreenBootstrap: mocktypes.NewCCIPOracle(t),
-				execBlue:             mocktypes.NewCCIPOracle(t),
-				execBlueBootstrap:    mocktypes.NewCCIPOracle(t),
-				execGreen:            mocktypes.NewCCIPOracle(t),
-				execGreenBootstrap:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.On("Start").Return(nil).Once()
-				args.commitGreenBootstrap.On("Start").Return(errors.New("failed")).Once()
-				args.execGreen.On("Start").Return(nil).Once()
-				args.execGreenBootstrap.On("Start").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.AssertExpectations(t)
-				args.commitGreenBootstrap.AssertExpectations(t)
-				args.execGreen.AssertExpectations(t)
-				args.execGreenBootstrap.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-		{
-			name: "invalid blue-green deployment transition commit: both prev and future deployment have green",
-			argsPrevDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: mocktypes.NewCCIPOracle(t),
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   mocktypes.NewCCIPOracle(t),
-			},
-			argsFutureDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: mocktypes.NewCCIPOracle(t),
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   mocktypes.NewCCIPOracle(t),
-			},
-			expect:  func(t *testing.T, args args, argsPrevDeployment args) {},
-			asserts: func(t *testing.T, args args, argsPrevDeployment args) {},
-			wantErr: true,
-		},
-		{
-			name: "invalid blue-green deployment transition exec: both prev and future deployment have green",
-			argsPrevDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: nil,
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   mocktypes.NewCCIPOracle(t),
-			},
-			argsFutureDeployment: args{
-				commitBlue:  mocktypes.NewCCIPOracle(t),
-				commitGreen: mocktypes.NewCCIPOracle(t),
-				execBlue:    mocktypes.NewCCIPOracle(t),
-				execGreen:   mocktypes.NewCCIPOracle(t),
-			},
-			expect: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.On("Start").Return(nil).Once()
-			},
-			asserts: func(t *testing.T, args args, argsPrevDeployment args) {
-				args.commitGreen.AssertExpectations(t)
-			},
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			futDeployment := &ccipDeployment{
-				commit: blueGreenDeployment{
-					blue: tt.argsFutureDeployment.commitBlue,
-				},
-				exec: blueGreenDeployment{
-					blue: tt.argsFutureDeployment.execBlue,
-				},
-			}
-			if tt.argsFutureDeployment.commitGreen != nil {
-				futDeployment.commit.green = tt.argsFutureDeployment.commitGreen
-			}
-			if tt.argsFutureDeployment.commitBlueBootstrap != nil {
-				futDeployment.commit.bootstrapBlue = tt.argsFutureDeployment.commitBlueBootstrap
-			}
-			if tt.argsFutureDeployment.commitGreenBootstrap != nil {
-				futDeployment.commit.bootstrapGreen = tt.argsFutureDeployment.commitGreenBootstrap
-			}
-			if tt.argsFutureDeployment.execGreen != nil {
-				futDeployment.exec.green = tt.argsFutureDeployment.execGreen
-			}
-			if tt.argsFutureDeployment.execBlueBootstrap != nil {
-				futDeployment.exec.bootstrapBlue = tt.argsFutureDeployment.execBlueBootstrap
-			}
-			if tt.argsFutureDeployment.execGreenBootstrap != nil {
-				futDeployment.exec.bootstrapGreen = tt.argsFutureDeployment.execGreenBootstrap
-			}
-
-			prevDeployment := &ccipDeployment{
-				commit: blueGreenDeployment{
-					blue: tt.argsPrevDeployment.commitBlue,
-				},
-				exec: blueGreenDeployment{
-					blue: tt.argsPrevDeployment.execBlue,
-				},
-			}
-			if tt.argsPrevDeployment.commitGreen != nil {
-				prevDeployment.commit.green = tt.argsPrevDeployment.commitGreen
-			}
-			if tt.argsPrevDeployment.commitBlueBootstrap != nil {
-				prevDeployment.commit.bootstrapBlue = tt.argsPrevDeployment.commitBlueBootstrap
-			}
-			if tt.argsPrevDeployment.commitGreenBootstrap != nil {
-				prevDeployment.commit.bootstrapGreen = tt.argsPrevDeployment.commitGreenBootstrap
-			}
-			if tt.argsPrevDeployment.execGreen != nil {
-				prevDeployment.exec.green = tt.argsPrevDeployment.execGreen
-			}
-			if tt.argsPrevDeployment.execBlueBootstrap != nil {
-				prevDeployment.exec.bootstrapBlue = tt.argsPrevDeployment.execBlueBootstrap
-			}
-			if tt.argsPrevDeployment.execGreenBootstrap != nil {
-				prevDeployment.exec.bootstrapGreen = tt.argsPrevDeployment.execGreenBootstrap
-			}
-
-			tt.expect(t, tt.argsFutureDeployment, tt.argsPrevDeployment)
-			defer tt.asserts(t, tt.argsFutureDeployment, tt.argsPrevDeployment)
-			err := futDeployment.HandleBlueGreen(prevDeployment)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func Test_isNewGreenInstance(t *testing.T) {
-	type args struct {
-		pluginType     cctypes.PluginType
-		ocrConfigs     []ccipreaderpkg.OCR3ConfigWithMeta
-		prevDeployment ccipDeployment
-	}
-	tests := []struct {
-		name string
-		args args
-		want bool
-	}{
-		{
-			"prev deployment only blue",
-			args{
-				pluginType: cctypes.PluginTypeCCIPCommit,
-				ocrConfigs: []ccipreaderpkg.OCR3ConfigWithMeta{
-					{}, {},
-				},
-				prevDeployment: ccipDeployment{
-					commit: blueGreenDeployment{
-						blue: mocktypes.NewCCIPOracle(t),
-					},
-				},
-			},
-			true,
-		},
-		{
-			"green -> blue promotion",
-			args{
-				pluginType: cctypes.PluginTypeCCIPCommit,
-				ocrConfigs: []ccipreaderpkg.OCR3ConfigWithMeta{
-					{},
-				},
-				prevDeployment: ccipDeployment{
-					commit: blueGreenDeployment{
-						blue:  mocktypes.NewCCIPOracle(t),
-						green: mocktypes.NewCCIPOracle(t),
-					},
-				},
-			},
-			false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := isNewGreenInstance(tt.args.pluginType, tt.args.ocrConfigs, tt.args.prevDeployment)
-			require.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func Test_isPromotion(t *testing.T) {
-	type args struct {
-		pluginType     cctypes.PluginType
-		ocrConfigs     []ccipreaderpkg.OCR3ConfigWithMeta
-		prevDeployment ccipDeployment
-	}
-	tests := []struct {
-		name string
-		args args
-		want bool
-	}{
-		{
-			"prev deployment only blue",
-			args{
-				pluginType: cctypes.PluginTypeCCIPCommit,
-				ocrConfigs: []ccipreaderpkg.OCR3ConfigWithMeta{
-					{}, {},
-				},
-				prevDeployment: ccipDeployment{
-					commit: blueGreenDeployment{
-						blue: mocktypes.NewCCIPOracle(t),
-					},
-				},
-			},
-			false,
-		},
-		{
-			"green -> blue promotion",
-			args{
-				pluginType: cctypes.PluginTypeCCIPCommit,
-				ocrConfigs: []ccipreaderpkg.OCR3ConfigWithMeta{
-					{},
-				},
-				prevDeployment: ccipDeployment{
-					commit: blueGreenDeployment{
-						blue:  mocktypes.NewCCIPOracle(t),
-						green: mocktypes.NewCCIPOracle(t),
-					},
-				},
-			},
-			true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := isPromotion(tt.args.pluginType, tt.args.ocrConfigs, tt.args.prevDeployment); got != tt.want {
-				t.Errorf("isPromotion() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_ccipDeployment_HasGreenInstance(t *testing.T) {
-	type fields struct {
-		commit blueGreenDeployment
-		exec   blueGreenDeployment
-	}
-	type args struct {
-		pluginType cctypes.PluginType
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		args   args
-		want   bool
-	}{
-		{
-			"commit green present",
-			fields{
-				commit: blueGreenDeployment{
-					blue:  mocktypes.NewCCIPOracle(t),
-					green: mocktypes.NewCCIPOracle(t),
-				},
-			},
-			args{
-				pluginType: cctypes.PluginTypeCCIPCommit,
-			},
-			true,
-		},
-		{
-			"commit green not present",
-			fields{
-				commit: blueGreenDeployment{
-					blue: mocktypes.NewCCIPOracle(t),
-				},
-			},
-			args{
-				pluginType: cctypes.PluginTypeCCIPCommit,
-			},
-			false,
-		},
-		{
-			"exec green present",
-			fields{
-				exec: blueGreenDeployment{
-					blue:  mocktypes.NewCCIPOracle(t),
-					green: mocktypes.NewCCIPOracle(t),
-				},
-			},
-			args{
-				pluginType: cctypes.PluginTypeCCIPExec,
-			},
-			true,
-		},
-		{
-			"exec green not present",
-			fields{
-				exec: blueGreenDeployment{
-					blue: mocktypes.NewCCIPOracle(t),
-				},
-			},
-			args{
-				pluginType: cctypes.PluginTypeCCIPExec,
-			},
-			false,
-		},
-		{
-			"invalid plugin type",
-			fields{},
-			args{
-				pluginType: cctypes.PluginType(100),
-			},
-			false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := &ccipDeployment{}
-			if tt.fields.commit.blue != nil {
-				c.commit.blue = tt.fields.commit.blue
-			}
-			if tt.fields.commit.green != nil {
-				c.commit.green = tt.fields.commit.green
-			}
-			if tt.fields.exec.blue != nil {
-				c.exec.blue = tt.fields.exec.blue
-			}
-			if tt.fields.exec.green != nil {
-				c.exec.green = tt.fields.exec.green
-			}
-			got := c.HasGreenInstance(tt.args.pluginType)
-			require.Equal(t, tt.want, got)
-		})
-	}
-}
diff --git a/core/capabilities/ccip/launcher/ccip_capability_launcher.png b/core/capabilities/ccip/launcher/ccip_capability_launcher.png
deleted file mode 100644
index 5e90d5ff7d..0000000000
Binary files a/core/capabilities/ccip/launcher/ccip_capability_launcher.png and /dev/null differ
diff --git a/core/capabilities/ccip/launcher/ccip_config_state_machine.png b/core/capabilities/ccip/launcher/ccip_config_state_machine.png
deleted file mode 100644
index ece40e6c19..0000000000
Binary files a/core/capabilities/ccip/launcher/ccip_config_state_machine.png and /dev/null differ
diff --git a/core/capabilities/ccip/launcher/diff.go b/core/capabilities/ccip/launcher/diff.go
deleted file mode 100644
index e44b5478ed..0000000000
--- a/core/capabilities/ccip/launcher/diff.go
+++ /dev/null
@@ -1,156 +0,0 @@
-package launcher
-
-import (
-	"fmt"
-
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
-
-	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
-
-	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
-)
-
-// diffResult contains the added, removed and updated CCIP DONs.
-// It is determined by using the `diff` function below.
-type diffResult struct {
-	added   map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo
-	removed map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo
-	updated map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo
-}
-
-// diff compares the old and new state and returns the added, removed and updated CCIP DONs.
-func diff(
-	capabilityVersion,
-	capabilityLabelledName string,
-	oldState,
-	newState registrysyncer.State,
-) (diffResult, error) {
-	ccipCapability, err := checkCapabilityPresence(capabilityVersion, capabilityLabelledName, newState)
-	if err != nil {
-		return diffResult{}, fmt.Errorf("failed to check capability presence: %w", err)
-	}
-
-	newCCIPDONs, err := filterCCIPDONs(ccipCapability, newState)
-	if err != nil {
-		return diffResult{}, fmt.Errorf("failed to filter CCIP DONs from new state: %w", err)
-	}
-
-	currCCIPDONs, err := filterCCIPDONs(ccipCapability, oldState)
-	if err != nil {
-		return diffResult{}, fmt.Errorf("failed to filter CCIP DONs from old state: %w", err)
-	}
-
-	// compare curr with new and launch or update OCR instances as needed
-	diffRes, err := compareDONs(currCCIPDONs, newCCIPDONs)
-	if err != nil {
-		return diffResult{}, fmt.Errorf("failed to compare CCIP DONs: %w", err)
-	}
-
-	return diffRes, nil
-}
-
-// compareDONs compares the current and new CCIP DONs and returns the added, removed and updated DONs.
-func compareDONs(
-	currCCIPDONs,
-	newCCIPDONs map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo,
-) (
-	dr diffResult,
-	err error,
-) {
-	added := make(map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo)
-	removed := make(map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo)
-	updated := make(map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo)
-
-	for id, don := range newCCIPDONs {
-		if currDONState, ok := currCCIPDONs[id]; !ok {
-			// Not in current state, so mark as added.
-			added[id] = don
-		} else {
-			// If its in the current state and the config count for the DON has changed, mark as updated.
-			// Since the registry returns the full state we need to compare the config count.
-			if don.ConfigCount > currDONState.ConfigCount {
-				updated[id] = don
-			}
-		}
-	}
-
-	for id, don := range currCCIPDONs {
-		if _, ok := newCCIPDONs[id]; !ok {
-			// In current state but not in latest registry state, so should remove.
-			removed[id] = don
-		}
-	}
-
-	return diffResult{
-		added:   added,
-		removed: removed,
-		updated: updated,
-	}, nil
-}
-
-// filterCCIPDONs filters the CCIP DONs from the given state.
-func filterCCIPDONs(
-	ccipCapability kcr.CapabilitiesRegistryCapabilityInfo,
-	state registrysyncer.State,
-) (map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo, error) {
-	ccipDONs := make(map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo)
-	for _, don := range state.IDsToDONs {
-		for _, donCapabilities := range don.CapabilityConfigurations {
-			hid, err := common.HashedCapabilityID(ccipCapability.LabelledName, ccipCapability.Version)
-			if err != nil {
-				return nil, fmt.Errorf("failed to hash capability id: %w", err)
-			}
-			if donCapabilities.CapabilityId == hid {
-				ccipDONs[registrysyncer.DonID(don.Id)] = don
-			}
-		}
-	}
-
-	return ccipDONs, nil
-}
-
-// checkCapabilityPresence checks if the capability with the given version and
-// labelled name is present in the given capability registry state.
-func checkCapabilityPresence(
-	capabilityVersion,
-	capabilityLabelledName string,
-	state registrysyncer.State,
-) (kcr.CapabilitiesRegistryCapabilityInfo, error) {
-	// Sanity check to make sure the capability registry has the capability we are looking for.
-	hid, err := common.HashedCapabilityID(capabilityLabelledName, capabilityVersion)
-	if err != nil {
-		return kcr.CapabilitiesRegistryCapabilityInfo{}, fmt.Errorf("failed to hash capability id: %w", err)
-	}
-	ccipCapability, ok := state.IDsToCapabilities[hid]
-	if !ok {
-		return kcr.CapabilitiesRegistryCapabilityInfo{},
-			fmt.Errorf("failed to find capability with name %s and version %s in capability registry state",
-				capabilityLabelledName, capabilityVersion)
-	}
-
-	return ccipCapability, nil
-}
-
-// isMemberOfDON returns true if and only if the given p2pID is a member of the given DON.
-func isMemberOfDON(don kcr.CapabilitiesRegistryDONInfo, p2pID ragep2ptypes.PeerID) bool {
-	for _, node := range don.NodeP2PIds {
-		if node == p2pID {
-			return true
-		}
-	}
-	return false
-}
-
-// isMemberOfBootstrapSubcommittee returns true if and only if the given p2pID is a member of the given bootstrap subcommittee.
-func isMemberOfBootstrapSubcommittee(
-	bootstrapP2PIDs [][32]byte,
-	p2pID ragep2ptypes.PeerID,
-) bool {
-	for _, bootstrapID := range bootstrapP2PIDs {
-		if bootstrapID == p2pID {
-			return true
-		}
-	}
-	return false
-}
diff --git a/core/capabilities/ccip/launcher/diff_test.go b/core/capabilities/ccip/launcher/diff_test.go
deleted file mode 100644
index 37371945ab..0000000000
--- a/core/capabilities/ccip/launcher/diff_test.go
+++ /dev/null
@@ -1,485 +0,0 @@
-package launcher
-
-import (
-	"fmt"
-	"math/big"
-	"reflect"
-	"testing"
-
-	capcommon "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
-
-	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
-	"github.com/stretchr/testify/require"
-
-	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
-	"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
-)
-
-const (
-	ccipCapVersion    = "v1.0.0"
-	ccipCapNewVersion = "v1.1.0"
-	ccipCapName       = "ccip"
-)
-
-func Test_diff(t *testing.T) {
-	type args struct {
-		capabilityVersion      string
-		capabilityLabelledName string
-		oldState               registrysyncer.State
-		newState               registrysyncer.State
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    diffResult
-		wantErr bool
-	}{
-		{
-			"no diff",
-			args{
-				capabilityVersion:      ccipCapVersion,
-				capabilityLabelledName: ccipCapName,
-				oldState: registrysyncer.State{
-					IDsToCapabilities: map[registrysyncer.HashedCapabilityID]kcr.CapabilitiesRegistryCapabilityInfo{
-						mustHashedCapabilityID(ccipCapName, ccipCapVersion): {
-							LabelledName: ccipCapName,
-							Version:      ccipCapVersion,
-						},
-					},
-					IDsToDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-							CapabilityConfigurations: []kcr.CapabilitiesRegistryCapabilityConfiguration{
-								{
-									CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapVersion),
-								},
-							},
-						},
-					},
-					IDsToNodes: map[types.PeerID]kcr.CapabilitiesRegistryNodeInfo{},
-				},
-				newState: registrysyncer.State{
-					IDsToCapabilities: map[registrysyncer.HashedCapabilityID]kcr.CapabilitiesRegistryCapabilityInfo{
-						mustHashedCapabilityID(ccipCapName, ccipCapVersion): {
-							LabelledName: ccipCapName,
-							Version:      ccipCapVersion,
-						},
-					},
-					IDsToDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-							CapabilityConfigurations: []kcr.CapabilitiesRegistryCapabilityConfiguration{
-								{
-									CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapVersion),
-								},
-							},
-						},
-					},
-					IDsToNodes: map[types.PeerID]kcr.CapabilitiesRegistryNodeInfo{},
-				},
-			},
-			diffResult{
-				added:   map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-				removed: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-				updated: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-			},
-			false,
-		},
-		{
-			"capability not present",
-			args{
-				capabilityVersion:      ccipCapVersion,
-				capabilityLabelledName: ccipCapName,
-				oldState: registrysyncer.State{
-					IDsToCapabilities: map[registrysyncer.HashedCapabilityID]kcr.CapabilitiesRegistryCapabilityInfo{
-						mustHashedCapabilityID(ccipCapName, ccipCapNewVersion): {
-							LabelledName: ccipCapName,
-							Version:      ccipCapNewVersion,
-						},
-					},
-				},
-				newState: registrysyncer.State{
-					IDsToCapabilities: map[registrysyncer.HashedCapabilityID]kcr.CapabilitiesRegistryCapabilityInfo{
-						mustHashedCapabilityID(ccipCapName, ccipCapNewVersion): {
-							LabelledName: ccipCapName,
-							Version:      ccipCapNewVersion,
-						},
-					},
-				},
-			},
-			diffResult{},
-			true,
-		},
-		{
-			"diff present, new don",
-			args{
-				capabilityVersion:      ccipCapVersion,
-				capabilityLabelledName: ccipCapName,
-				oldState: registrysyncer.State{
-					IDsToCapabilities: map[registrysyncer.HashedCapabilityID]kcr.CapabilitiesRegistryCapabilityInfo{
-						mustHashedCapabilityID(ccipCapName, ccipCapVersion): {
-							LabelledName: ccipCapName,
-							Version:      ccipCapVersion,
-						},
-					},
-					IDsToDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-				},
-				newState: registrysyncer.State{
-					IDsToCapabilities: map[registrysyncer.HashedCapabilityID]kcr.CapabilitiesRegistryCapabilityInfo{
-						mustHashedCapabilityID(ccipCapName, ccipCapVersion): {
-							LabelledName: ccipCapName,
-							Version:      ccipCapVersion,
-						},
-					},
-					IDsToDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-							CapabilityConfigurations: []kcr.CapabilitiesRegistryCapabilityConfiguration{
-								{
-									CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapVersion),
-								},
-							},
-						},
-					},
-				},
-			},
-			diffResult{
-				added: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-					1: {
-						Id: 1,
-						CapabilityConfigurations: []kcr.CapabilitiesRegistryCapabilityConfiguration{
-							{
-								CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapVersion),
-							},
-						},
-					},
-				},
-				removed: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-				updated: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-			},
-			false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := diff(tt.args.capabilityVersion, tt.args.capabilityLabelledName, tt.args.oldState, tt.args.newState)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-				require.Equal(t, tt.want, got)
-			}
-		})
-	}
-}
-
-func Test_compareDONs(t *testing.T) {
-	type args struct {
-		currCCIPDONs map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo
-		newCCIPDONs  map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo
-	}
-	tests := []struct {
-		name        string
-		args        args
-		wantAdded   map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo
-		wantRemoved map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo
-		wantUpdated map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo
-		wantErr     bool
-	}{
-		{
-			"added dons",
-			args{
-				currCCIPDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-				newCCIPDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-					1: {
-						Id: 1,
-					},
-				},
-			},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-				1: {
-					Id: 1,
-				},
-			},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-			false,
-		},
-		{
-			"removed dons",
-			args{
-				currCCIPDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-					1: {
-						Id: 1,
-					},
-				},
-				newCCIPDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-			},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-				1: {
-					Id: 1,
-				},
-			},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-			false,
-		},
-		{
-			"updated dons",
-			args{
-				currCCIPDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-					1: {
-						Id:          1,
-						ConfigCount: 1,
-					},
-				},
-				newCCIPDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-					1: {
-						Id:          1,
-						ConfigCount: 2,
-					},
-				},
-			},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-				1: {
-					Id:          1,
-					ConfigCount: 2,
-				},
-			},
-			false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			dr, err := compareDONs(tt.args.currCCIPDONs, tt.args.newCCIPDONs)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-				require.Equal(t, tt.wantAdded, dr.added)
-				require.Equal(t, tt.wantRemoved, dr.removed)
-				require.Equal(t, tt.wantUpdated, dr.updated)
-			}
-		})
-	}
-}
-
-func Test_filterCCIPDONs(t *testing.T) {
-	type args struct {
-		ccipCapability kcr.CapabilitiesRegistryCapabilityInfo
-		state          registrysyncer.State
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo
-		wantErr bool
-	}{
-		{
-			"one ccip don",
-			args{
-				ccipCapability: kcr.CapabilitiesRegistryCapabilityInfo{
-					LabelledName: ccipCapName,
-					Version:      ccipCapVersion,
-				},
-				state: registrysyncer.State{
-					IDsToDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-							CapabilityConfigurations: []kcr.CapabilitiesRegistryCapabilityConfiguration{
-								{
-									CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapVersion),
-								},
-							},
-						},
-					},
-				},
-			},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-				1: {
-					Id: 1,
-					CapabilityConfigurations: []kcr.CapabilitiesRegistryCapabilityConfiguration{
-						{
-							CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapVersion),
-						},
-					},
-				},
-			},
-			false,
-		},
-		{
-			"no ccip dons",
-			args{
-				ccipCapability: kcr.CapabilitiesRegistryCapabilityInfo{
-					LabelledName: ccipCapName,
-					Version:      ccipCapVersion,
-				},
-				state: registrysyncer.State{
-					IDsToDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-							CapabilityConfigurations: []kcr.CapabilitiesRegistryCapabilityConfiguration{
-								{
-									CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapNewVersion),
-								},
-							},
-						},
-					},
-				},
-			},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-			false,
-		},
-		{
-			"don with multiple capabilities, one of them ccip",
-			args{
-				ccipCapability: kcr.CapabilitiesRegistryCapabilityInfo{
-					LabelledName: ccipCapName,
-					Version:      ccipCapVersion,
-				},
-				state: registrysyncer.State{
-					IDsToDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-							CapabilityConfigurations: []kcr.CapabilitiesRegistryCapabilityConfiguration{
-								{
-									CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapVersion),
-								},
-								{
-									CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapNewVersion),
-								},
-							},
-						},
-					},
-				},
-			},
-			map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-				1: {
-					Id: 1,
-					CapabilityConfigurations: []kcr.CapabilitiesRegistryCapabilityConfiguration{
-						{
-							CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapVersion),
-						},
-						{
-							CapabilityId: mustHashedCapabilityID(ccipCapName, ccipCapNewVersion),
-						},
-					},
-				},
-			},
-			false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := filterCCIPDONs(tt.args.ccipCapability, tt.args.state)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-				require.Equal(t, tt.want, got)
-			}
-		})
-	}
-}
-
-func Test_checkCapabilityPresence(t *testing.T) {
-	type args struct {
-		capabilityVersion      string
-		capabilityLabelledName string
-		state                  registrysyncer.State
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    kcr.CapabilitiesRegistryCapabilityInfo
-		wantErr bool
-	}{
-		{
-			"in registry state",
-			args{
-				capabilityVersion:      ccipCapVersion,
-				capabilityLabelledName: ccipCapName,
-				state: registrysyncer.State{
-					IDsToCapabilities: map[registrysyncer.HashedCapabilityID]kcr.CapabilitiesRegistryCapabilityInfo{
-						mustHashedCapabilityID(ccipCapName, ccipCapVersion): {
-							LabelledName: ccipCapName,
-							Version:      ccipCapVersion,
-						},
-						mustHashedCapabilityID(ccipCapName, ccipCapNewVersion): {
-							LabelledName: ccipCapName,
-							Version:      ccipCapNewVersion,
-						},
-					},
-				},
-			},
-			kcr.CapabilitiesRegistryCapabilityInfo{
-				LabelledName: ccipCapName,
-				Version:      ccipCapVersion,
-			},
-			false,
-		},
-		{
-			"not in registry state",
-			args{
-				capabilityVersion:      ccipCapVersion,
-				capabilityLabelledName: ccipCapName,
-				state: registrysyncer.State{
-					IDsToCapabilities: map[registrysyncer.HashedCapabilityID]kcr.CapabilitiesRegistryCapabilityInfo{
-						mustHashedCapabilityID(ccipCapName, ccipCapNewVersion): {
-							LabelledName: ccipCapName,
-							Version:      ccipCapNewVersion,
-						},
-					},
-				},
-			},
-			kcr.CapabilitiesRegistryCapabilityInfo{},
-			true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := checkCapabilityPresence(tt.args.capabilityVersion, tt.args.capabilityLabelledName, tt.args.state)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("checkCapabilityPresence() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("checkCapabilityPresence() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_isMemberOfDON(t *testing.T) {
-	var p2pIDs [][32]byte
-	for i := range [4]struct{}{} {
-		p2pIDs = append(p2pIDs, p2pkey.MustNewV2XXXTestingOnly(big.NewInt(int64(i+1))).PeerID())
-	}
-	don := kcr.CapabilitiesRegistryDONInfo{
-		Id:         1,
-		NodeP2PIds: p2pIDs,
-	}
-	require.True(t, isMemberOfDON(don, ragep2ptypes.PeerID(p2pkey.MustNewV2XXXTestingOnly(big.NewInt(1)).PeerID())))
-	require.False(t, isMemberOfDON(don, ragep2ptypes.PeerID(p2pkey.MustNewV2XXXTestingOnly(big.NewInt(5)).PeerID())))
-}
-
-func Test_isMemberOfBootstrapSubcommittee(t *testing.T) {
-	var bootstrapKeys [][32]byte
-	for i := range [4]struct{}{} {
-		bootstrapKeys = append(bootstrapKeys, p2pkey.MustNewV2XXXTestingOnly(big.NewInt(int64(i+1))).PeerID())
-	}
-	require.True(t, isMemberOfBootstrapSubcommittee(bootstrapKeys, ragep2ptypes.PeerID(p2pkey.MustNewV2XXXTestingOnly(big.NewInt(1)).PeerID())))
-	require.False(t, isMemberOfBootstrapSubcommittee(bootstrapKeys, ragep2ptypes.PeerID(p2pkey.MustNewV2XXXTestingOnly(big.NewInt(5)).PeerID())))
-}
-
-func mustHashedCapabilityID(capabilityLabelledName, capabilityVersion string) [32]byte {
-	r, err := capcommon.HashedCapabilityID(capabilityLabelledName, capabilityVersion)
-	if err != nil {
-		panic(fmt.Errorf("failed to hash capability id (labelled name: %s, version: %s): %w", capabilityLabelledName, capabilityVersion, err))
-	}
-	return r
-}
diff --git a/core/capabilities/ccip/launcher/integration_test.go b/core/capabilities/ccip/launcher/integration_test.go
deleted file mode 100644
index 58b6a5d6a2..0000000000
--- a/core/capabilities/ccip/launcher/integration_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package launcher
-
-import (
-	"testing"
-	"time"
-
-	it "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ccip_integration_tests/integrationhelpers"
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-
-	"github.com/onsi/gomega"
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
-)
-
-func TestIntegration_Launcher(t *testing.T) {
-	ctx := testutils.Context(t)
-	lggr := logger.TestLogger(t)
-	uni := it.NewTestUniverse(ctx, t, lggr)
-	// We need 3*f + 1 p2pIDs to have enough nodes to bootstrap
-	var arr []int64
-	n := int(it.FChainA*3 + 1)
-	for i := 0; i <= n; i++ {
-		arr = append(arr, int64(i))
-	}
-	p2pIDs := it.P2pIDsFromInts(arr)
-	uni.AddCapability(p2pIDs)
-
-	regSyncer, err := registrysyncer.New(lggr, uni, uni.CapReg.Address().String())
-	require.NoError(t, err)
-
-	hcr := uni.HomeChainReader
-	launcher := New(
-		it.CcipCapabilityVersion,
-		it.CcipCapabilityLabelledName,
-		p2pIDs[0],
-		logger.TestLogger(t),
-		hcr,
-		&oracleCreatorPrints{
-			t: t,
-		},
-		1*time.Second,
-	)
-	regSyncer.AddLauncher(launcher)
-
-	require.NoError(t, launcher.Start(ctx))
-	require.NoError(t, regSyncer.Start(ctx))
-	t.Cleanup(func() { require.NoError(t, regSyncer.Close()) })
-	t.Cleanup(func() { require.NoError(t, launcher.Close()) })
-
-	chainAConf := it.SetupConfigInfo(it.ChainA, p2pIDs, it.FChainA, []byte("ChainA"))
-	chainBConf := it.SetupConfigInfo(it.ChainB, p2pIDs[1:], it.FChainB, []byte("ChainB"))
-	chainCConf := it.SetupConfigInfo(it.ChainC, p2pIDs[2:], it.FChainC, []byte("ChainC"))
-	inputConfig := []ccip_config.CCIPConfigTypesChainConfigInfo{
-		chainAConf,
-		chainBConf,
-		chainCConf,
-	}
-	_, err = uni.CcipCfg.ApplyChainConfigUpdates(uni.Transactor, nil, inputConfig)
-	require.NoError(t, err)
-	uni.Backend.Commit()
-
-	ccipCapabilityID, err := uni.CapReg.GetHashedCapabilityId(nil, it.CcipCapabilityLabelledName, it.CcipCapabilityVersion)
-	require.NoError(t, err)
-
-	uni.AddDONToRegistry(
-		ccipCapabilityID,
-		it.ChainA,
-		it.FChainA,
-		p2pIDs[1],
-		p2pIDs)
-
-	gomega.NewWithT(t).Eventually(func() bool {
-		return len(launcher.runningDONIDs()) == 1
-	}, testutils.WaitTimeout(t), testutils.TestInterval).Should(gomega.BeTrue())
-}
-
-type oraclePrints struct {
-	t           *testing.T
-	pluginType  cctypes.PluginType
-	config      cctypes.OCR3ConfigWithMeta
-	isBootstrap bool
-}
-
-func (o *oraclePrints) Start() error {
-	o.t.Logf("Starting oracle (pluginType: %s, isBootstrap: %t) with config %+v\n", o.pluginType, o.isBootstrap, o.config)
-	return nil
-}
-
-func (o *oraclePrints) Close() error {
-	o.t.Logf("Closing oracle (pluginType: %s, isBootstrap: %t) with config %+v\n", o.pluginType, o.isBootstrap, o.config)
-	return nil
-}
-
-type oracleCreatorPrints struct {
-	t *testing.T
-}
-
-func (o *oracleCreatorPrints) CreatePluginOracle(pluginType cctypes.PluginType, config cctypes.OCR3ConfigWithMeta) (cctypes.CCIPOracle, error) {
-	o.t.Logf("Creating plugin oracle (pluginType: %s) with config %+v\n", pluginType, config)
-	return &oraclePrints{pluginType: pluginType, config: config, t: o.t}, nil
-}
-
-func (o *oracleCreatorPrints) CreateBootstrapOracle(config cctypes.OCR3ConfigWithMeta) (cctypes.CCIPOracle, error) {
-	o.t.Logf("Creating bootstrap oracle with config %+v\n", config)
-	return &oraclePrints{pluginType: cctypes.PluginTypeCCIPCommit, config: config, isBootstrap: true, t: o.t}, nil
-}
-
-var _ cctypes.OracleCreator = &oracleCreatorPrints{}
-var _ cctypes.CCIPOracle = &oraclePrints{}
diff --git a/core/capabilities/ccip/launcher/launcher.go b/core/capabilities/ccip/launcher/launcher.go
deleted file mode 100644
index 9acfebfa9a..0000000000
--- a/core/capabilities/ccip/launcher/launcher.go
+++ /dev/null
@@ -1,435 +0,0 @@
-package launcher
-
-import (
-	"context"
-	"fmt"
-	"sync"
-	"time"
-
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-
-	"go.uber.org/multierr"
-
-	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
-
-	ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-	"github.com/smartcontractkit/chainlink-common/pkg/services"
-
-	ccipreader "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-	kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/job"
-	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
-	"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
-)
-
-var (
-	_ job.ServiceCtx          = (*launcher)(nil)
-	_ registrysyncer.Launcher = (*launcher)(nil)
-)
-
-func New(
-	capabilityVersion,
-	capabilityLabelledName string,
-	p2pID ragep2ptypes.PeerID,
-	lggr logger.Logger,
-	homeChainReader ccipreader.HomeChain,
-	oracleCreator cctypes.OracleCreator,
-	tickInterval time.Duration,
-) *launcher {
-	return &launcher{
-		capabilityVersion:      capabilityVersion,
-		capabilityLabelledName: capabilityLabelledName,
-		p2pID:                  p2pID,
-		lggr:                   lggr,
-		homeChainReader:        homeChainReader,
-		regState: registrysyncer.State{
-			IDsToDONs:         make(map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo),
-			IDsToNodes:        make(map[p2ptypes.PeerID]kcr.CapabilitiesRegistryNodeInfo),
-			IDsToCapabilities: make(map[registrysyncer.HashedCapabilityID]kcr.CapabilitiesRegistryCapabilityInfo),
-		},
-		oracleCreator: oracleCreator,
-		dons:          make(map[registrysyncer.DonID]*ccipDeployment),
-		tickInterval:  tickInterval,
-	}
-}
-
-// launcher manages the lifecycles of the CCIP capability on all chains.
-type launcher struct {
-	services.StateMachine
-
-	capabilityVersion      string
-	capabilityLabelledName string
-	p2pID                  ragep2ptypes.PeerID
-	lggr                   logger.Logger
-	homeChainReader        ccipreader.HomeChain
-	stopChan               chan struct{}
-	// latestState is the latest capability registry state received from the syncer.
-	latestState registrysyncer.State
-	// regState is the latest capability registry state that we have successfully processed.
-	regState      registrysyncer.State
-	oracleCreator cctypes.OracleCreator
-	lock          sync.RWMutex
-	wg            sync.WaitGroup
-	tickInterval  time.Duration
-
-	// dons is a map of CCIP DON IDs to the OCR instances that are running on them.
-	// we can have up to two OCR instances per CCIP plugin, since we are running two plugins,
-	// thats four OCR instances per CCIP DON maximum.
-	dons map[registrysyncer.DonID]*ccipDeployment
-}
-
-// Launch implements registrysyncer.Launcher.
-func (l *launcher) Launch(ctx context.Context, state registrysyncer.State) error {
-	l.lock.Lock()
-	defer l.lock.Unlock()
-	l.lggr.Debugw("Received new state from syncer", "dons", state.IDsToDONs)
-	l.latestState = state
-	return nil
-}
-
-func (l *launcher) getLatestState() registrysyncer.State {
-	l.lock.RLock()
-	defer l.lock.RUnlock()
-	return l.latestState
-}
-
-func (l *launcher) runningDONIDs() []registrysyncer.DonID {
-	l.lock.RLock()
-	defer l.lock.RUnlock()
-	var runningDONs []registrysyncer.DonID
-	for id := range l.dons {
-		runningDONs = append(runningDONs, id)
-	}
-	return runningDONs
-}
-
-// Close implements job.ServiceCtx.
-func (l *launcher) Close() error {
-	return l.StateMachine.StopOnce("launcher", func() error {
-		// shut down the monitor goroutine.
-		close(l.stopChan)
-		l.wg.Wait()
-
-		// shut down all running oracles.
-		var err error
-		for _, ceDep := range l.dons {
-			err = multierr.Append(err, ceDep.Close())
-		}
-
-		return err
-	})
-}
-
-// Start implements job.ServiceCtx.
-func (l *launcher) Start(context.Context) error {
-	return l.StartOnce("launcher", func() error {
-		l.stopChan = make(chan struct{})
-		l.wg.Add(1)
-		go l.monitor()
-		return nil
-	})
-}
-
-func (l *launcher) monitor() {
-	defer l.wg.Done()
-	ticker := time.NewTicker(l.tickInterval)
-	for {
-		select {
-		case <-l.stopChan:
-			return
-		case <-ticker.C:
-			if err := l.tick(); err != nil {
-				l.lggr.Errorw("Failed to tick", "err", err)
-			}
-		}
-	}
-}
-
-func (l *launcher) tick() error {
-	// Ensure that the home chain reader is healthy.
-	// For new jobs it may be possible that the home chain reader is not yet ready
-	// so we won't be able to fetch configs and start any OCR instances.
-	if ready := l.homeChainReader.Ready(); ready != nil {
-		return fmt.Errorf("home chain reader is not ready: %w", ready)
-	}
-
-	// Fetch the latest state from the capability registry and determine if we need to
-	// launch or update any OCR instances.
-	latestState := l.getLatestState()
-
-	diffRes, err := diff(l.capabilityVersion, l.capabilityLabelledName, l.regState, latestState)
-	if err != nil {
-		return fmt.Errorf("failed to diff capability registry states: %w", err)
-	}
-
-	err = l.processDiff(diffRes)
-	if err != nil {
-		return fmt.Errorf("failed to process diff: %w", err)
-	}
-
-	return nil
-}
-
-// processDiff processes the diff between the current and latest capability registry states.
-// for any added OCR instances, it will launch them.
-// for any removed OCR instances, it will shut them down.
-// for any updated OCR instances, it will restart them with the new configuration.
-func (l *launcher) processDiff(diff diffResult) error {
-	err := l.processRemoved(diff.removed)
-	err = multierr.Append(err, l.processAdded(diff.added))
-	err = multierr.Append(err, l.processUpdate(diff.updated))
-
-	return err
-}
-
-func (l *launcher) processUpdate(updated map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo) error {
-	l.lock.Lock()
-	defer l.lock.Unlock()
-
-	for donID, don := range updated {
-		prevDeployment, ok := l.dons[registrysyncer.DonID(don.Id)]
-		if !ok {
-			return fmt.Errorf("invariant violation: expected to find CCIP DON %d in the map of running deployments", don.Id)
-		}
-
-		futDeployment, err := updateDON(
-			l.lggr,
-			l.p2pID,
-			l.homeChainReader,
-			l.oracleCreator,
-			*prevDeployment,
-			don,
-		)
-		if err != nil {
-			return err
-		}
-		if err := futDeployment.HandleBlueGreen(prevDeployment); err != nil {
-			// TODO: how to handle a failed blue-green deployment?
-			return fmt.Errorf("failed to handle blue-green deployment for CCIP DON %d: %w", donID, err)
-		}
-
-		// update state.
-		l.dons[donID] = futDeployment
-		// update the state with the latest config.
-		// this way if one of the starts errors, we don't retry all of them.
-		l.regState.IDsToDONs[donID] = updated[donID]
-	}
-
-	return nil
-}
-
-func (l *launcher) processAdded(added map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo) error {
-	l.lock.Lock()
-	defer l.lock.Unlock()
-
-	for donID, don := range added {
-		dep, err := createDON(
-			l.lggr,
-			l.p2pID,
-			l.homeChainReader,
-			l.oracleCreator,
-			don,
-		)
-		if err != nil {
-			return err
-		}
-		if dep == nil {
-			// not a member of this DON.
-			continue
-		}
-
-		if err := dep.StartBlue(); err != nil {
-			if shutdownErr := dep.CloseBlue(); shutdownErr != nil {
-				l.lggr.Errorw("Failed to shutdown blue instance after failed start", "donId", donID, "err", shutdownErr)
-			}
-			return fmt.Errorf("failed to start oracles for CCIP DON %d: %w", donID, err)
-		}
-
-		// update state.
-		l.dons[donID] = dep
-		// update the state with the latest config.
-		// this way if one of the starts errors, we don't retry all of them.
-		l.regState.IDsToDONs[donID] = added[donID]
-	}
-
-	return nil
-}
-
-func (l *launcher) processRemoved(removed map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo) error {
-	l.lock.Lock()
-	defer l.lock.Unlock()
-
-	for id := range removed {
-		ceDep, ok := l.dons[id]
-		if !ok {
-			// not running this particular DON.
-			continue
-		}
-
-		if err := ceDep.Close(); err != nil {
-			return fmt.Errorf("failed to shutdown oracles for CCIP DON %d: %w", id, err)
-		}
-
-		// after a successful shutdown we can safely remove the DON deployment from the map.
-		delete(l.dons, id)
-		delete(l.regState.IDsToDONs, id)
-	}
-
-	return nil
-}
-
-// updateDON is a pure function that handles the case where a DON in the capability registry
-// has received a new configuration.
-// It returns a new ccipDeployment that can then be used to perform the blue-green deployment,
-// based on the previous deployment.
-func updateDON(
-	lggr logger.Logger,
-	p2pID ragep2ptypes.PeerID,
-	homeChainReader ccipreader.HomeChain,
-	oracleCreator cctypes.OracleCreator,
-	prevDeployment ccipDeployment,
-	don kcr.CapabilitiesRegistryDONInfo,
-) (futDeployment *ccipDeployment, err error) {
-	if !isMemberOfDON(don, p2pID) {
-		lggr.Infow("Not a member of this DON, skipping", "donId", don.Id, "p2pId", p2pID.String())
-		return nil, nil
-	}
-
-	// this should be a retryable error.
-	commitOCRConfigs, err := homeChainReader.GetOCRConfigs(context.Background(), don.Id, uint8(cctypes.PluginTypeCCIPCommit))
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch OCR configs for CCIP commit plugin (don id: %d) from home chain config contract: %w",
-			don.Id, err)
-	}
-
-	execOCRConfigs, err := homeChainReader.GetOCRConfigs(context.Background(), don.Id, uint8(cctypes.PluginTypeCCIPExec))
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch OCR configs for CCIP exec plugin (don id: %d) from home chain config contract: %w",
-			don.Id, err)
-	}
-
-	commitBgd, err := createFutureBlueGreenDeployment(prevDeployment, commitOCRConfigs, oracleCreator, cctypes.PluginTypeCCIPCommit)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create future blue-green deployment for CCIP commit plugin: %w, don id: %d", err, don.Id)
-	}
-
-	execBgd, err := createFutureBlueGreenDeployment(prevDeployment, execOCRConfigs, oracleCreator, cctypes.PluginTypeCCIPExec)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create future blue-green deployment for CCIP exec plugin: %w, don id: %d", err, don.Id)
-	}
-
-	return &ccipDeployment{
-		commit: commitBgd,
-		exec:   execBgd,
-	}, nil
-}
-
-// valid cases:
-// a) len(ocrConfigs) == 2 && !prevDeployment.HasGreenInstance(pluginType): this is a new green instance.
-// b) len(ocrConfigs) == 1 && prevDeployment.HasGreenInstance(): this is a promotion of green->blue.
-// All other cases are invalid. This is enforced in the ccip config contract.
-func createFutureBlueGreenDeployment(
-	prevDeployment ccipDeployment,
-	ocrConfigs []ccipreaderpkg.OCR3ConfigWithMeta,
-	oracleCreator cctypes.OracleCreator,
-	pluginType cctypes.PluginType,
-) (blueGreenDeployment, error) {
-	var deployment blueGreenDeployment
-	if isNewGreenInstance(pluginType, ocrConfigs, prevDeployment) {
-		// this is a new green instance.
-		greenOracle, err := oracleCreator.CreatePluginOracle(pluginType, cctypes.OCR3ConfigWithMeta(ocrConfigs[1]))
-		if err != nil {
-			return blueGreenDeployment{}, fmt.Errorf("failed to create CCIP commit oracle: %w", err)
-		}
-
-		deployment.blue = prevDeployment.commit.blue
-		deployment.green = greenOracle
-	} else if isPromotion(pluginType, ocrConfigs, prevDeployment) {
-		// this is a promotion of green->blue.
-		deployment.blue = prevDeployment.commit.green
-	} else {
-		return blueGreenDeployment{}, fmt.Errorf("invariant violation: expected 1 or 2 OCR configs for CCIP plugin (type: %d), got %d", pluginType, len(ocrConfigs))
-	}
-
-	return deployment, nil
-}
-
-// createDON is a pure function that handles the case where a new DON is added to the capability registry.
-// It returns a new ccipDeployment that can then be used to start the blue instance.
-func createDON(
-	lggr logger.Logger,
-	p2pID ragep2ptypes.PeerID,
-	homeChainReader ccipreader.HomeChain,
-	oracleCreator cctypes.OracleCreator,
-	don kcr.CapabilitiesRegistryDONInfo,
-) (*ccipDeployment, error) {
-	if !isMemberOfDON(don, p2pID) {
-		lggr.Infow("Not a member of this DON, skipping", "donId", don.Id, "p2pId", p2pID.String())
-		return nil, nil
-	}
-
-	// this should be a retryable error.
-	commitOCRConfigs, err := homeChainReader.GetOCRConfigs(context.Background(), don.Id, uint8(cctypes.PluginTypeCCIPCommit))
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch OCR configs for CCIP commit plugin (don id: %d) from home chain config contract: %w",
-			don.Id, err)
-	}
-
-	execOCRConfigs, err := homeChainReader.GetOCRConfigs(context.Background(), don.Id, uint8(cctypes.PluginTypeCCIPExec))
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch OCR configs for CCIP exec plugin (don id: %d) from home chain config contract: %w",
-			don.Id, err)
-	}
-
-	// upon creation we should only have one OCR config per plugin type.
-	if len(commitOCRConfigs) != 1 {
-		return nil, fmt.Errorf("expected exactly one OCR config for CCIP commit plugin (don id: %d), got %d", don.Id, len(commitOCRConfigs))
-	}
-
-	if len(execOCRConfigs) != 1 {
-		return nil, fmt.Errorf("expected exactly one OCR config for CCIP exec plugin (don id: %d), got %d", don.Id, len(execOCRConfigs))
-	}
-
-	commitOracle, commitBootstrap, err := createOracle(p2pID, oracleCreator, cctypes.PluginTypeCCIPCommit, commitOCRConfigs)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create CCIP commit oracle: %w", err)
-	}
-
-	execOracle, execBootstrap, err := createOracle(p2pID, oracleCreator, cctypes.PluginTypeCCIPExec, execOCRConfigs)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create CCIP exec oracle: %w", err)
-	}
-
-	return &ccipDeployment{
-		commit: blueGreenDeployment{
-			blue:          commitOracle,
-			bootstrapBlue: commitBootstrap,
-		},
-		exec: blueGreenDeployment{
-			blue:          execOracle,
-			bootstrapBlue: execBootstrap,
-		},
-	}, nil
-}
-
-func createOracle(
-	p2pID ragep2ptypes.PeerID,
-	oracleCreator cctypes.OracleCreator,
-	pluginType cctypes.PluginType,
-	ocrConfigs []ccipreaderpkg.OCR3ConfigWithMeta,
-) (pluginOracle, bootstrapOracle cctypes.CCIPOracle, err error) {
-	pluginOracle, err = oracleCreator.CreatePluginOracle(pluginType, cctypes.OCR3ConfigWithMeta(ocrConfigs[0]))
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to create CCIP plugin oracle (plugintype: %d): %w", pluginType, err)
-	}
-
-	if isMemberOfBootstrapSubcommittee(ocrConfigs[0].Config.BootstrapP2PIds, p2pID) {
-		bootstrapOracle, err = oracleCreator.CreateBootstrapOracle(cctypes.OCR3ConfigWithMeta(ocrConfigs[0]))
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to create CCIP bootstrap oracle (plugintype: %d): %w", pluginType, err)
-		}
-	}
-
-	return pluginOracle, bootstrapOracle, nil
-}
diff --git a/core/capabilities/ccip/launcher/launcher_test.go b/core/capabilities/ccip/launcher/launcher_test.go
deleted file mode 100644
index 493f962c2c..0000000000
--- a/core/capabilities/ccip/launcher/launcher_test.go
+++ /dev/null
@@ -1,496 +0,0 @@
-package launcher
-
-import (
-	"errors"
-	"math/big"
-	"reflect"
-	"testing"
-
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types/mocks"
-
-	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
-	ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-
-	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/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
-)
-
-func Test_createOracle(t *testing.T) {
-	var p2pKeys []ragep2ptypes.PeerID
-	for i := 0; i < 3; i++ {
-		p2pKeys = append(p2pKeys, ragep2ptypes.PeerID(p2pkey.MustNewV2XXXTestingOnly(big.NewInt(int64(i+1))).PeerID()))
-	}
-	myP2PKey := p2pKeys[0]
-	type args struct {
-		p2pID         ragep2ptypes.PeerID
-		oracleCreator *mocks.OracleCreator
-		pluginType    cctypes.PluginType
-		ocrConfigs    []ccipreaderpkg.OCR3ConfigWithMeta
-	}
-	tests := []struct {
-		name    string
-		args    args
-		expect  func(t *testing.T, args args, oracleCreator *mocks.OracleCreator)
-		wantErr bool
-	}{
-		{
-			"success, no bootstrap",
-			args{
-				myP2PKey,
-				mocks.NewOracleCreator(t),
-				cctypes.PluginTypeCCIPCommit,
-				[]ccipreaderpkg.OCR3ConfigWithMeta{
-					{
-						Config:       ccipreaderpkg.OCR3Config{},
-						ConfigCount:  1,
-						ConfigDigest: testutils.Random32Byte(),
-					},
-				},
-			},
-			func(t *testing.T, args args, oracleCreator *mocks.OracleCreator) {
-				oracleCreator.
-					On("CreatePluginOracle", cctypes.PluginTypeCCIPCommit, cctypes.OCR3ConfigWithMeta(args.ocrConfigs[0])).
-					Return(mocks.NewCCIPOracle(t), nil)
-			},
-			false,
-		},
-		{
-			"success, with bootstrap",
-			args{
-				myP2PKey,
-				mocks.NewOracleCreator(t),
-				cctypes.PluginTypeCCIPCommit,
-				[]ccipreaderpkg.OCR3ConfigWithMeta{
-					{
-						Config: ccipreaderpkg.OCR3Config{
-							BootstrapP2PIds: [][32]byte{myP2PKey},
-						},
-						ConfigCount:  1,
-						ConfigDigest: testutils.Random32Byte(),
-					},
-				},
-			},
-			func(t *testing.T, args args, oracleCreator *mocks.OracleCreator) {
-				oracleCreator.
-					On("CreatePluginOracle", cctypes.PluginTypeCCIPCommit, cctypes.OCR3ConfigWithMeta(args.ocrConfigs[0])).
-					Return(mocks.NewCCIPOracle(t), nil)
-				oracleCreator.
-					On("CreateBootstrapOracle", cctypes.OCR3ConfigWithMeta(args.ocrConfigs[0])).
-					Return(mocks.NewCCIPOracle(t), nil)
-			},
-			false,
-		},
-		{
-			"error creating plugin oracle",
-			args{
-				myP2PKey,
-				mocks.NewOracleCreator(t),
-				cctypes.PluginTypeCCIPCommit,
-				[]ccipreaderpkg.OCR3ConfigWithMeta{
-					{
-						Config:       ccipreaderpkg.OCR3Config{},
-						ConfigCount:  1,
-						ConfigDigest: testutils.Random32Byte(),
-					},
-				},
-			},
-			func(t *testing.T, args args, oracleCreator *mocks.OracleCreator) {
-				oracleCreator.
-					On("CreatePluginOracle", cctypes.PluginTypeCCIPCommit, cctypes.OCR3ConfigWithMeta(args.ocrConfigs[0])).
-					Return(nil, errors.New("error creating oracle"))
-			},
-			true,
-		},
-		{
-			"error creating bootstrap oracle",
-			args{
-				myP2PKey,
-				mocks.NewOracleCreator(t),
-				cctypes.PluginTypeCCIPCommit,
-				[]ccipreaderpkg.OCR3ConfigWithMeta{
-					{
-						Config: ccipreaderpkg.OCR3Config{
-							BootstrapP2PIds: [][32]byte{myP2PKey},
-						},
-						ConfigCount:  1,
-						ConfigDigest: testutils.Random32Byte(),
-					},
-				},
-			},
-			func(t *testing.T, args args, oracleCreator *mocks.OracleCreator) {
-				oracleCreator.
-					On("CreatePluginOracle", cctypes.PluginTypeCCIPCommit, cctypes.OCR3ConfigWithMeta(args.ocrConfigs[0])).
-					Return(mocks.NewCCIPOracle(t), nil)
-				oracleCreator.
-					On("CreateBootstrapOracle", cctypes.OCR3ConfigWithMeta(args.ocrConfigs[0])).
-					Return(nil, errors.New("error creating oracle"))
-			},
-			true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tt.expect(t, tt.args, tt.args.oracleCreator)
-			_, _, err := createOracle(tt.args.p2pID, tt.args.oracleCreator, tt.args.pluginType, tt.args.ocrConfigs)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func Test_createDON(t *testing.T) {
-	type args struct {
-		lggr            logger.Logger
-		p2pID           ragep2ptypes.PeerID
-		homeChainReader *mocks.HomeChainReader
-		oracleCreator   *mocks.OracleCreator
-		don             kcr.CapabilitiesRegistryDONInfo
-	}
-	tests := []struct {
-		name    string
-		args    args
-		expect  func(t *testing.T, args args, oracleCreator *mocks.OracleCreator, homeChainReader *mocks.HomeChainReader)
-		wantErr bool
-	}{
-		{
-			"not a member of the DON",
-			args{
-				logger.TestLogger(t),
-				ragep2ptypes.PeerID(p2pkey.MustNewV2XXXTestingOnly(big.NewInt(1)).PeerID()),
-				mocks.NewHomeChainReader(t),
-				mocks.NewOracleCreator(t),
-				kcr.CapabilitiesRegistryDONInfo{
-					NodeP2PIds: [][32]byte{
-						p2pkey.MustNewV2XXXTestingOnly(big.NewInt(2)).PeerID(),
-					},
-					Id: 2,
-				},
-			},
-			func(t *testing.T, args args, oracleCreator *mocks.OracleCreator, homeChainReader *mocks.HomeChainReader) {
-			},
-			false,
-		},
-		{
-			"success, no bootstrap",
-			args{
-				logger.TestLogger(t),
-				ragep2ptypes.PeerID(p2pkey.MustNewV2XXXTestingOnly(big.NewInt(1)).PeerID()),
-				mocks.NewHomeChainReader(t),
-				mocks.NewOracleCreator(t),
-				kcr.CapabilitiesRegistryDONInfo{
-					NodeP2PIds: [][32]byte{
-						p2pkey.MustNewV2XXXTestingOnly(big.NewInt(1)).PeerID(),
-					},
-					Id: 1,
-				},
-			},
-			func(t *testing.T, args args, oracleCreator *mocks.OracleCreator, homeChainReader *mocks.HomeChainReader) {
-				homeChainReader.
-					On("GetOCRConfigs", mock.Anything, uint32(1), uint8(cctypes.PluginTypeCCIPCommit)).
-					Return([]ccipreaderpkg.OCR3ConfigWithMeta{{}}, nil)
-				homeChainReader.
-					On("GetOCRConfigs", mock.Anything, uint32(1), uint8(cctypes.PluginTypeCCIPExec)).
-					Return([]ccipreaderpkg.OCR3ConfigWithMeta{{}}, nil)
-				oracleCreator.
-					On("CreatePluginOracle", cctypes.PluginTypeCCIPCommit, mock.Anything).
-					Return(mocks.NewCCIPOracle(t), nil)
-				oracleCreator.
-					On("CreatePluginOracle", cctypes.PluginTypeCCIPExec, mock.Anything).
-					Return(mocks.NewCCIPOracle(t), nil)
-			},
-			false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.expect != nil {
-				tt.expect(t, tt.args, tt.args.oracleCreator, tt.args.homeChainReader)
-			}
-			_, err := createDON(tt.args.lggr, tt.args.p2pID, tt.args.homeChainReader, tt.args.oracleCreator, tt.args.don)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func Test_createFutureBlueGreenDeployment(t *testing.T) {
-	type args struct {
-		prevDeployment ccipDeployment
-		ocrConfigs     []ccipreaderpkg.OCR3ConfigWithMeta
-		oracleCreator  *mocks.OracleCreator
-		pluginType     cctypes.PluginType
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    blueGreenDeployment
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := createFutureBlueGreenDeployment(tt.args.prevDeployment, tt.args.ocrConfigs, tt.args.oracleCreator, tt.args.pluginType)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("createFutureBlueGreenDeployment() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("createFutureBlueGreenDeployment() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_updateDON(t *testing.T) {
-	type args struct {
-		lggr            logger.Logger
-		p2pID           ragep2ptypes.PeerID
-		homeChainReader *mocks.HomeChainReader
-		oracleCreator   *mocks.OracleCreator
-		prevDeployment  ccipDeployment
-		don             kcr.CapabilitiesRegistryDONInfo
-	}
-	tests := []struct {
-		name              string
-		args              args
-		wantFutDeployment *ccipDeployment
-		wantErr           bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotFutDeployment, err := updateDON(tt.args.lggr, tt.args.p2pID, tt.args.homeChainReader, tt.args.oracleCreator, tt.args.prevDeployment, tt.args.don)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("updateDON() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(gotFutDeployment, tt.wantFutDeployment) {
-				t.Errorf("updateDON() = %v, want %v", gotFutDeployment, tt.wantFutDeployment)
-			}
-		})
-	}
-}
-
-func Test_launcher_processDiff(t *testing.T) {
-	type fields struct {
-		lggr            logger.Logger
-		p2pID           ragep2ptypes.PeerID
-		homeChainReader *mocks.HomeChainReader
-		oracleCreator   *mocks.OracleCreator
-		dons            map[registrysyncer.DonID]*ccipDeployment
-		regState        registrysyncer.State
-	}
-	type args struct {
-		diff diffResult
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		assert  func(t *testing.T, l *launcher)
-		wantErr bool
-	}{
-		{
-			"don removed success",
-			fields{
-				dons: map[registrysyncer.DonID]*ccipDeployment{
-					1: {
-						commit: blueGreenDeployment{
-							blue: newMock(t,
-								func(t *testing.T) *mocks.CCIPOracle { return mocks.NewCCIPOracle(t) },
-								func(m *mocks.CCIPOracle) {
-									m.On("Close").Return(nil)
-								}),
-						},
-						exec: blueGreenDeployment{
-							blue: newMock(t,
-								func(t *testing.T) *mocks.CCIPOracle { return mocks.NewCCIPOracle(t) },
-								func(m *mocks.CCIPOracle) {
-									m.On("Close").Return(nil)
-								}),
-						},
-					},
-				},
-				regState: registrysyncer.State{
-					IDsToDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-						},
-					},
-				},
-			},
-			args{
-				diff: diffResult{
-					removed: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-						},
-					},
-				},
-			},
-			func(t *testing.T, l *launcher) {
-				require.Len(t, l.dons, 0)
-				require.Len(t, l.regState.IDsToDONs, 0)
-			},
-			false,
-		},
-		{
-			"don added success",
-			fields{
-				lggr:  logger.TestLogger(t),
-				p2pID: ragep2ptypes.PeerID(p2pkey.MustNewV2XXXTestingOnly(big.NewInt(1)).PeerID()),
-				homeChainReader: newMock(t, func(t *testing.T) *mocks.HomeChainReader {
-					return mocks.NewHomeChainReader(t)
-				}, func(m *mocks.HomeChainReader) {
-					m.On("GetOCRConfigs", mock.Anything, uint32(1), uint8(cctypes.PluginTypeCCIPCommit)).
-						Return([]ccipreaderpkg.OCR3ConfigWithMeta{{}}, nil)
-					m.On("GetOCRConfigs", mock.Anything, uint32(1), uint8(cctypes.PluginTypeCCIPExec)).
-						Return([]ccipreaderpkg.OCR3ConfigWithMeta{{}}, nil)
-				}),
-				oracleCreator: newMock(t, func(t *testing.T) *mocks.OracleCreator {
-					return mocks.NewOracleCreator(t)
-				}, func(m *mocks.OracleCreator) {
-					commitOracle := mocks.NewCCIPOracle(t)
-					commitOracle.On("Start").Return(nil)
-					execOracle := mocks.NewCCIPOracle(t)
-					execOracle.On("Start").Return(nil)
-					m.On("CreatePluginOracle", cctypes.PluginTypeCCIPCommit, mock.Anything).
-						Return(commitOracle, nil)
-					m.On("CreatePluginOracle", cctypes.PluginTypeCCIPExec, mock.Anything).
-						Return(execOracle, nil)
-				}),
-				dons: map[registrysyncer.DonID]*ccipDeployment{},
-				regState: registrysyncer.State{
-					IDsToDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{},
-				},
-			},
-			args{
-				diff: diffResult{
-					added: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-							NodeP2PIds: [][32]byte{
-								p2pkey.MustNewV2XXXTestingOnly(big.NewInt(1)).PeerID(),
-							},
-						},
-					},
-				},
-			},
-			func(t *testing.T, l *launcher) {
-				require.Len(t, l.dons, 1)
-				require.Len(t, l.regState.IDsToDONs, 1)
-			},
-			false,
-		},
-		{
-			"don updated new green instance success",
-			fields{
-				lggr:  logger.TestLogger(t),
-				p2pID: ragep2ptypes.PeerID(p2pkey.MustNewV2XXXTestingOnly(big.NewInt(1)).PeerID()),
-				homeChainReader: newMock(t, func(t *testing.T) *mocks.HomeChainReader {
-					return mocks.NewHomeChainReader(t)
-				}, func(m *mocks.HomeChainReader) {
-					m.On("GetOCRConfigs", mock.Anything, uint32(1), uint8(cctypes.PluginTypeCCIPCommit)).
-						Return([]ccipreaderpkg.OCR3ConfigWithMeta{{}, {}}, nil)
-					m.On("GetOCRConfigs", mock.Anything, uint32(1), uint8(cctypes.PluginTypeCCIPExec)).
-						Return([]ccipreaderpkg.OCR3ConfigWithMeta{{}, {}}, nil)
-				}),
-				oracleCreator: newMock(t, func(t *testing.T) *mocks.OracleCreator {
-					return mocks.NewOracleCreator(t)
-				}, func(m *mocks.OracleCreator) {
-					commitOracle := mocks.NewCCIPOracle(t)
-					commitOracle.On("Start").Return(nil)
-					execOracle := mocks.NewCCIPOracle(t)
-					execOracle.On("Start").Return(nil)
-					m.On("CreatePluginOracle", cctypes.PluginTypeCCIPCommit, mock.Anything).
-						Return(commitOracle, nil)
-					m.On("CreatePluginOracle", cctypes.PluginTypeCCIPExec, mock.Anything).
-						Return(execOracle, nil)
-				}),
-				dons: map[registrysyncer.DonID]*ccipDeployment{
-					1: {
-						commit: blueGreenDeployment{
-							blue: newMock(t, func(t *testing.T) *mocks.CCIPOracle {
-								return mocks.NewCCIPOracle(t)
-							}, func(m *mocks.CCIPOracle) {}),
-						},
-						exec: blueGreenDeployment{
-							blue: newMock(t, func(t *testing.T) *mocks.CCIPOracle {
-								return mocks.NewCCIPOracle(t)
-							}, func(m *mocks.CCIPOracle) {}),
-						},
-					},
-				},
-				regState: registrysyncer.State{
-					IDsToDONs: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-							NodeP2PIds: [][32]byte{
-								p2pkey.MustNewV2XXXTestingOnly(big.NewInt(1)).PeerID(),
-							},
-						},
-					},
-				},
-			},
-			args{
-				diff: diffResult{
-					updated: map[registrysyncer.DonID]kcr.CapabilitiesRegistryDONInfo{
-						1: {
-							Id: 1,
-							NodeP2PIds: [][32]byte{
-								p2pkey.MustNewV2XXXTestingOnly(big.NewInt(1)).PeerID(),
-								p2pkey.MustNewV2XXXTestingOnly(big.NewInt(2)).PeerID(), // new node in don
-							},
-						},
-					},
-				},
-			},
-			func(t *testing.T, l *launcher) {
-				require.Len(t, l.dons, 1)
-				require.Len(t, l.regState.IDsToDONs, 1)
-				require.Len(t, l.regState.IDsToDONs[1].NodeP2PIds, 2)
-			},
-			false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			l := &launcher{
-				dons:            tt.fields.dons,
-				regState:        tt.fields.regState,
-				p2pID:           tt.fields.p2pID,
-				lggr:            tt.fields.lggr,
-				homeChainReader: tt.fields.homeChainReader,
-				oracleCreator:   tt.fields.oracleCreator,
-			}
-			err := l.processDiff(tt.args.diff)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-			tt.assert(t, l)
-		})
-	}
-}
-
-func newMock[T any](t *testing.T, newer func(t *testing.T) T, expect func(m T)) T {
-	o := newer(t)
-	expect(o)
-	return o
-}
diff --git a/core/capabilities/ccip/ocrimpls/config_digester.go b/core/capabilities/ccip/ocrimpls/config_digester.go
deleted file mode 100644
index ef0c5e7ca3..0000000000
--- a/core/capabilities/ccip/ocrimpls/config_digester.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package ocrimpls
-
-import "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
-type configDigester struct {
-	d types.ConfigDigest
-}
-
-func NewConfigDigester(d types.ConfigDigest) *configDigester {
-	return &configDigester{d: d}
-}
-
-// ConfigDigest implements types.OffchainConfigDigester.
-func (c *configDigester) ConfigDigest(types.ContractConfig) (types.ConfigDigest, error) {
-	return c.d, nil
-}
-
-// ConfigDigestPrefix implements types.OffchainConfigDigester.
-func (c *configDigester) ConfigDigestPrefix() (types.ConfigDigestPrefix, error) {
-	return types.ConfigDigestPrefixCCIPMultiRole, nil
-}
-
-var _ types.OffchainConfigDigester = (*configDigester)(nil)
diff --git a/core/capabilities/ccip/ocrimpls/config_tracker.go b/core/capabilities/ccip/ocrimpls/config_tracker.go
deleted file mode 100644
index 3a6a27fa40..0000000000
--- a/core/capabilities/ccip/ocrimpls/config_tracker.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package ocrimpls
-
-import (
-	"context"
-
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-
-	gethcommon "github.com/ethereum/go-ethereum/common"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3confighelper"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-)
-
-type configTracker struct {
-	cfg cctypes.OCR3ConfigWithMeta
-}
-
-func NewConfigTracker(cfg cctypes.OCR3ConfigWithMeta) *configTracker {
-	return &configTracker{cfg: cfg}
-}
-
-// LatestBlockHeight implements types.ContractConfigTracker.
-func (c *configTracker) LatestBlockHeight(ctx context.Context) (blockHeight uint64, err error) {
-	return 0, nil
-}
-
-// LatestConfig implements types.ContractConfigTracker.
-func (c *configTracker) LatestConfig(ctx context.Context, changedInBlock uint64) (types.ContractConfig, error) {
-	return c.contractConfig(), nil
-}
-
-// LatestConfigDetails implements types.ContractConfigTracker.
-func (c *configTracker) LatestConfigDetails(ctx context.Context) (changedInBlock uint64, configDigest types.ConfigDigest, err error) {
-	return 0, c.cfg.ConfigDigest, nil
-}
-
-// Notify implements types.ContractConfigTracker.
-func (c *configTracker) Notify() <-chan struct{} {
-	return nil
-}
-
-func (c *configTracker) contractConfig() types.ContractConfig {
-	return types.ContractConfig{
-		ConfigDigest:          c.cfg.ConfigDigest,
-		ConfigCount:           c.cfg.ConfigCount,
-		Signers:               toOnchainPublicKeys(c.cfg.Config.Signers),
-		Transmitters:          toOCRAccounts(c.cfg.Config.Transmitters),
-		F:                     c.cfg.Config.F,
-		OnchainConfig:         []byte{},
-		OffchainConfigVersion: c.cfg.Config.OffchainConfigVersion,
-		OffchainConfig:        c.cfg.Config.OffchainConfig,
-	}
-}
-
-// PublicConfig returns the OCR configuration as a PublicConfig so that we can
-// access ReportingPluginConfig and other fields prior to launching the plugins.
-func (c *configTracker) PublicConfig() (ocr3confighelper.PublicConfig, error) {
-	return ocr3confighelper.PublicConfigFromContractConfig(false, c.contractConfig())
-}
-
-func toOnchainPublicKeys(signers [][]byte) []types.OnchainPublicKey {
-	keys := make([]types.OnchainPublicKey, len(signers))
-	for i, signer := range signers {
-		keys[i] = types.OnchainPublicKey(signer)
-	}
-	return keys
-}
-
-func toOCRAccounts(transmitters [][]byte) []types.Account {
-	accounts := make([]types.Account, len(transmitters))
-	for i, transmitter := range transmitters {
-		// TODO: string-encode the transmitter appropriately to the dest chain family.
-		accounts[i] = types.Account(gethcommon.BytesToAddress(transmitter).Hex())
-	}
-	return accounts
-}
-
-var _ types.ContractConfigTracker = (*configTracker)(nil)
diff --git a/core/capabilities/ccip/ocrimpls/contract_transmitter.go b/core/capabilities/ccip/ocrimpls/contract_transmitter.go
deleted file mode 100644
index fd8e206d0e..0000000000
--- a/core/capabilities/ccip/ocrimpls/contract_transmitter.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package ocrimpls
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"math/big"
-
-	"github.com/google/uuid"
-	"github.com/smartcontractkit/libocr/offchainreporting2/chains/evmutil"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
-	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
-	"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
-	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
-)
-
-type ToCalldataFunc func(rawReportCtx [3][32]byte, report []byte, rs, ss [][32]byte, vs [32]byte) any
-
-func ToCommitCalldata(rawReportCtx [3][32]byte, report []byte, rs, ss [][32]byte, vs [32]byte) any {
-	// Note that the name of the struct field is very important, since the encoder used
-	// by the chainwriter uses mapstructure, which will use the struct field name to map
-	// to the argument name in the function call.
-	// If, for whatever reason, we want to change the field name, make sure to add a `mapstructure:"<arg_name>"` tag
-	// for that field.
-	return struct {
-		ReportContext [3][32]byte
-		Report        []byte
-		Rs            [][32]byte
-		Ss            [][32]byte
-		RawVs         [32]byte
-	}{
-		ReportContext: rawReportCtx,
-		Report:        report,
-		Rs:            rs,
-		Ss:            ss,
-		RawVs:         vs,
-	}
-}
-
-func ToExecCalldata(rawReportCtx [3][32]byte, report []byte, _, _ [][32]byte, _ [32]byte) any {
-	// Note that the name of the struct field is very important, since the encoder used
-	// by the chainwriter uses mapstructure, which will use the struct field name to map
-	// to the argument name in the function call.
-	// If, for whatever reason, we want to change the field name, make sure to add a `mapstructure:"<arg_name>"` tag
-	// for that field.
-	return struct {
-		ReportContext [3][32]byte
-		Report        []byte
-	}{
-		ReportContext: rawReportCtx,
-		Report:        report,
-	}
-}
-
-var _ ocr3types.ContractTransmitter[[]byte] = &commitTransmitter[[]byte]{}
-
-type commitTransmitter[RI any] struct {
-	cw             commontypes.ChainWriter
-	fromAccount    ocrtypes.Account
-	contractName   string
-	method         string
-	offrampAddress string
-	toCalldataFn   ToCalldataFunc
-}
-
-func XXXNewContractTransmitterTestsOnly[RI any](
-	cw commontypes.ChainWriter,
-	fromAccount ocrtypes.Account,
-	contractName string,
-	method string,
-	offrampAddress string,
-	toCalldataFn ToCalldataFunc,
-) ocr3types.ContractTransmitter[RI] {
-	return &commitTransmitter[RI]{
-		cw:             cw,
-		fromAccount:    fromAccount,
-		contractName:   contractName,
-		method:         method,
-		offrampAddress: offrampAddress,
-		toCalldataFn:   toCalldataFn,
-	}
-}
-
-func NewCommitContractTransmitter[RI any](
-	cw commontypes.ChainWriter,
-	fromAccount ocrtypes.Account,
-	offrampAddress string,
-) ocr3types.ContractTransmitter[RI] {
-	return &commitTransmitter[RI]{
-		cw:             cw,
-		fromAccount:    fromAccount,
-		contractName:   consts.ContractNameOffRamp,
-		method:         consts.MethodCommit,
-		offrampAddress: offrampAddress,
-		toCalldataFn:   ToCommitCalldata,
-	}
-}
-
-func NewExecContractTransmitter[RI any](
-	cw commontypes.ChainWriter,
-	fromAccount ocrtypes.Account,
-	offrampAddress string,
-) ocr3types.ContractTransmitter[RI] {
-	return &commitTransmitter[RI]{
-		cw:             cw,
-		fromAccount:    fromAccount,
-		contractName:   consts.ContractNameOffRamp,
-		method:         consts.MethodExecute,
-		offrampAddress: offrampAddress,
-		toCalldataFn:   ToExecCalldata,
-	}
-}
-
-// FromAccount implements ocr3types.ContractTransmitter.
-func (c *commitTransmitter[RI]) FromAccount() (ocrtypes.Account, error) {
-	return c.fromAccount, nil
-}
-
-// Transmit implements ocr3types.ContractTransmitter.
-func (c *commitTransmitter[RI]) Transmit(
-	ctx context.Context,
-	configDigest ocrtypes.ConfigDigest,
-	seqNr uint64,
-	reportWithInfo ocr3types.ReportWithInfo[RI],
-	sigs []ocrtypes.AttributedOnchainSignature,
-) error {
-	var rs [][32]byte
-	var ss [][32]byte
-	var vs [32]byte
-	if len(sigs) > 32 {
-		return errors.New("too many signatures, maximum is 32")
-	}
-	for i, as := range sigs {
-		r, s, v, err := evmutil.SplitSignature(as.Signature)
-		if err != nil {
-			return fmt.Errorf("failed to split signature: %w", err)
-		}
-		rs = append(rs, r)
-		ss = append(ss, s)
-		vs[i] = v
-	}
-
-	// report ctx for OCR3 consists of the following
-	// reportContext[0]: ConfigDigest
-	// reportContext[1]: 24 byte padding, 8 byte sequence number
-	// reportContext[2]: unused
-	// convert seqNum, which is a uint64, into a uint32 epoch and uint8 round
-	// while this does truncate the sequence number, it is not a problem because
-	// it still gives us 2^40 - 1 possible sequence numbers.
-	// assuming a sequence number is generated every second, this gives us
-	// 1099511627775 seconds, or approximately 34,865 years, before we run out
-	// of sequence numbers.
-	epoch, round := uint64ToUint32AndUint8(seqNr)
-	rawReportCtx := evmutil.RawReportContext(ocrtypes.ReportContext{
-		ReportTimestamp: ocrtypes.ReportTimestamp{
-			ConfigDigest: configDigest,
-			Epoch:        epoch,
-			Round:        round,
-		},
-		// ExtraData not used in OCR3
-	})
-
-	if c.toCalldataFn == nil {
-		return errors.New("toCalldataFn is nil")
-	}
-
-	// chain writer takes in the raw calldata and packs it on its own.
-	args := c.toCalldataFn(rawReportCtx, reportWithInfo.Report, rs, ss, vs)
-
-	// TODO: no meta fields yet, what should we add?
-	// probably whats in the info part of the report?
-	meta := commontypes.TxMeta{}
-	txID, err := uuid.NewRandom() // NOTE: CW expects us to generate an ID, rather than return one
-	if err != nil {
-		return fmt.Errorf("failed to generate UUID: %w", err)
-	}
-	zero := big.NewInt(0)
-	if err := c.cw.SubmitTransaction(ctx, c.contractName, c.method, args, fmt.Sprintf("%s-%s-%s", c.contractName, c.offrampAddress, txID.String()), c.offrampAddress, &meta, zero); err != nil {
-		return fmt.Errorf("failed to submit transaction thru chainwriter: %w", err)
-	}
-
-	return nil
-}
-
-func uint64ToUint32AndUint8(x uint64) (uint32, uint8) {
-	return uint32(x >> 32), uint8(x)
-}
diff --git a/core/capabilities/ccip/ocrimpls/contract_transmitter_test.go b/core/capabilities/ccip/ocrimpls/contract_transmitter_test.go
deleted file mode 100644
index 4e0a7162aa..0000000000
--- a/core/capabilities/ccip/ocrimpls/contract_transmitter_test.go
+++ /dev/null
@@ -1,690 +0,0 @@
-package ocrimpls_test
-
-import (
-	"crypto/rand"
-	"math/big"
-	"net/url"
-	"testing"
-	"time"
-
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ocrimpls"
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/jmoiron/sqlx"
-	"github.com/onsi/gomega"
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/libocr/commontypes"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
-	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
-	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/chaintype"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/keystore"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/config"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/multi_ocr3_helper"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	kschaintype "github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
-)
-
-func Test_ContractTransmitter_TransmitWithoutSignatures(t *testing.T) {
-	type testCase struct {
-		name                string
-		pluginType          uint8
-		withSigs            bool
-		expectedSigsEnabled bool
-		report              []byte
-	}
-
-	testCases := []testCase{
-		{
-			"empty report with sigs",
-			uint8(cctypes.PluginTypeCCIPCommit),
-			true,
-			true,
-			[]byte{},
-		},
-		{
-			"empty report without sigs",
-			uint8(cctypes.PluginTypeCCIPExec),
-			false,
-			false,
-			[]byte{},
-		},
-		{
-			"report with data with sigs",
-			uint8(cctypes.PluginTypeCCIPCommit),
-			true,
-			true,
-			randomReport(t, 96),
-		},
-		{
-			"report with data without sigs",
-			uint8(cctypes.PluginTypeCCIPExec),
-			false,
-			false,
-			randomReport(t, 96),
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			tc := tc
-			t.Parallel()
-			testTransmitter(t, tc.pluginType, tc.withSigs, tc.expectedSigsEnabled, tc.report)
-		})
-	}
-}
-
-func testTransmitter(
-	t *testing.T,
-	pluginType uint8,
-	withSigs bool,
-	expectedSigsEnabled bool,
-	report []byte,
-) {
-	uni := newTestUniverse[[]byte](t, nil)
-
-	c, err := uni.wrapper.LatestConfigDetails(nil, pluginType)
-	require.NoError(t, err, "failed to get latest config details")
-	configDigest := c.ConfigInfo.ConfigDigest
-	require.Equal(t, expectedSigsEnabled, c.ConfigInfo.IsSignatureVerificationEnabled, "signature verification enabled setting not correct")
-
-	// set the plugin type on the helper so it fetches the right config info.
-	// the important aspect is whether signatures should be enabled or not.
-	_, err = uni.wrapper.SetTransmitOcrPluginType(uni.deployer, pluginType)
-	require.NoError(t, err, "failed to set plugin type")
-	uni.backend.Commit()
-
-	// create attributed sigs
-	// only need f+1 which is 2 in this case
-	rwi := ocr3types.ReportWithInfo[[]byte]{
-		Report: report,
-		Info:   []byte{},
-	}
-	seqNr := uint64(1)
-	attributedSigs := uni.SignReport(t, configDigest, rwi, seqNr)
-
-	account, err := uni.transmitterWithSigs.FromAccount()
-	require.NoError(t, err, "failed to get from account")
-	require.Equal(t, ocrtypes.Account(uni.transmitters[0].Hex()), account, "from account mismatch")
-	if withSigs {
-		err = uni.transmitterWithSigs.Transmit(testutils.Context(t), configDigest, seqNr, rwi, attributedSigs)
-	} else {
-		err = uni.transmitterWithoutSigs.Transmit(testutils.Context(t), configDigest, seqNr, rwi, attributedSigs)
-	}
-	require.NoError(t, err, "failed to transmit")
-	uni.backend.Commit()
-
-	var txStatus uint64
-	gomega.NewWithT(t).Eventually(func() bool {
-		uni.backend.Commit()
-		rows, err := uni.db.QueryContext(testutils.Context(t), `SELECT hash FROM evm.tx_attempts LIMIT 1`)
-		require.NoError(t, err, "failed to query txes")
-		defer rows.Close()
-		var txHash []byte
-		for rows.Next() {
-			require.NoError(t, rows.Scan(&txHash), "failed to scan")
-		}
-		t.Log("txHash:", txHash)
-		receipt, err := uni.simClient.TransactionReceipt(testutils.Context(t), common.BytesToHash(txHash))
-		if err != nil {
-			t.Log("tx not found yet:", hexutil.Encode(txHash))
-			return false
-		}
-		t.Log("tx found:", hexutil.Encode(txHash), "status:", receipt.Status)
-		txStatus = receipt.Status
-		return true
-	}, testutils.WaitTimeout(t), 1*time.Second).Should(gomega.BeTrue())
-
-	// wait for receipt to be written to the db
-	gomega.NewWithT(t).Eventually(func() bool {
-		rows, err := uni.db.QueryContext(testutils.Context(t), `SELECT count(*) as cnt FROM evm.receipts LIMIT 1`)
-		require.NoError(t, err, "failed to query receipts")
-		defer rows.Close()
-		var count int
-		for rows.Next() {
-			require.NoError(t, rows.Scan(&count), "failed to scan")
-		}
-		return count == 1
-	}, testutils.WaitTimeout(t), 2*time.Second).Should(gomega.BeTrue())
-
-	require.Equal(t, uint64(1), txStatus, "tx status should be success")
-
-	// check that the event was emitted
-	events := uni.TransmittedEvents(t)
-	require.Len(t, events, 1, "expected 1 event")
-	require.Equal(t, configDigest, events[0].ConfigDigest, "config digest mismatch")
-	require.Equal(t, seqNr, events[0].SequenceNumber, "seq num mismatch")
-}
-
-type testUniverse[RI any] struct {
-	simClient              *client.SimulatedBackendClient
-	backend                *backends.SimulatedBackend
-	deployer               *bind.TransactOpts
-	transmitters           []common.Address
-	signers                []common.Address
-	wrapper                *multi_ocr3_helper.MultiOCR3Helper
-	transmitterWithSigs    ocr3types.ContractTransmitter[RI]
-	transmitterWithoutSigs ocr3types.ContractTransmitter[RI]
-	keyrings               []ocr3types.OnchainKeyring[RI]
-	f                      uint8
-	db                     *sqlx.DB
-	txm                    txmgr.TxManager
-	gasEstimator           gas.EvmFeeEstimator
-}
-
-type keyringsAndSigners[RI any] struct {
-	keyrings []ocr3types.OnchainKeyring[RI]
-	signers  []common.Address
-}
-
-func newTestUniverse[RI any](t *testing.T, ks *keyringsAndSigners[RI]) *testUniverse[RI] {
-	t.Helper()
-
-	db := pgtest.NewSqlxDB(t)
-	owner := testutils.MustNewSimTransactor(t)
-
-	// create many transmitters but only need to fund one, rest are to get
-	// setOCR3Config to pass.
-	keyStore := cltest.NewKeyStore(t, db)
-	var transmitters []common.Address
-	for i := 0; i < 4; i++ {
-		key, err := keyStore.Eth().Create(testutils.Context(t), big.NewInt(1337))
-		require.NoError(t, err, "failed to create key")
-		transmitters = append(transmitters, key.Address)
-	}
-
-	backend := backends.NewSimulatedBackend(core.GenesisAlloc{
-		owner.From: core.GenesisAccount{
-			Balance: assets.Ether(1000).ToInt(),
-		},
-		transmitters[0]: core.GenesisAccount{
-			Balance: assets.Ether(1000).ToInt(),
-		},
-	}, 30e6)
-
-	ocr3HelperAddr, _, _, err := multi_ocr3_helper.DeployMultiOCR3Helper(owner, backend)
-	require.NoError(t, err)
-	backend.Commit()
-	wrapper, err := multi_ocr3_helper.NewMultiOCR3Helper(ocr3HelperAddr, backend)
-	require.NoError(t, err)
-
-	// create the oracle identities for setConfig
-	// need to create at least 4 identities otherwise setConfig will fail
-	var (
-		keyrings []ocr3types.OnchainKeyring[RI]
-		signers  []common.Address
-	)
-	if ks != nil {
-		keyrings = ks.keyrings
-		signers = ks.signers
-	} else {
-		for i := 0; i < 4; i++ {
-			kb, err2 := ocr2key.New(kschaintype.EVM)
-			require.NoError(t, err2, "failed to create key")
-			kr := ocrimpls.NewOnchainKeyring[RI](kb, logger.TestLogger(t))
-			signers = append(signers, common.BytesToAddress(kr.PublicKey()))
-			keyrings = append(keyrings, kr)
-		}
-	}
-	f := uint8(1)
-	commitConfigDigest := testutils.Random32Byte()
-	execConfigDigest := testutils.Random32Byte()
-	_, err = wrapper.SetOCR3Configs(
-		owner,
-		[]multi_ocr3_helper.MultiOCR3BaseOCRConfigArgs{
-			{
-				ConfigDigest:                   commitConfigDigest,
-				OcrPluginType:                  uint8(cctypes.PluginTypeCCIPCommit),
-				F:                              f,
-				IsSignatureVerificationEnabled: true,
-				Signers:                        signers,
-				Transmitters: []common.Address{
-					transmitters[0],
-					transmitters[1],
-					transmitters[2],
-					transmitters[3],
-				},
-			},
-			{
-				ConfigDigest:                   execConfigDigest,
-				OcrPluginType:                  uint8(cctypes.PluginTypeCCIPExec),
-				F:                              f,
-				IsSignatureVerificationEnabled: false,
-				Signers:                        signers,
-				Transmitters: []common.Address{
-					transmitters[0],
-					transmitters[1],
-					transmitters[2],
-					transmitters[3],
-				},
-			},
-		},
-	)
-	require.NoError(t, err)
-	backend.Commit()
-
-	commitConfig, err := wrapper.LatestConfigDetails(nil, uint8(cctypes.PluginTypeCCIPCommit))
-	require.NoError(t, err, "failed to get latest commit config")
-	require.Equal(t, commitConfigDigest, commitConfig.ConfigInfo.ConfigDigest, "commit config digest mismatch")
-	execConfig, err := wrapper.LatestConfigDetails(nil, uint8(cctypes.PluginTypeCCIPExec))
-	require.NoError(t, err, "failed to get latest exec config")
-	require.Equal(t, execConfigDigest, execConfig.ConfigInfo.ConfigDigest, "exec config digest mismatch")
-
-	simClient := client.NewSimulatedBackendClient(t, backend, testutils.SimulatedChainID)
-
-	// create the chain writer service
-	txm, gasEstimator := makeTestEvmTxm(t, db, simClient, keyStore.Eth())
-	require.NoError(t, txm.Start(testutils.Context(t)), "failed to start tx manager")
-	t.Cleanup(func() { require.NoError(t, txm.Close()) })
-
-	chainWriter, err := evm.NewChainWriterService(
-		logger.TestLogger(t),
-		simClient,
-		txm,
-		gasEstimator,
-		chainWriterConfigRaw(transmitters[0], assets.GWei(1)))
-	require.NoError(t, err, "failed to create chain writer")
-	require.NoError(t, chainWriter.Start(testutils.Context(t)), "failed to start chain writer")
-	t.Cleanup(func() { require.NoError(t, chainWriter.Close()) })
-
-	transmitterWithSigs := ocrimpls.XXXNewContractTransmitterTestsOnly[RI](
-		chainWriter,
-		ocrtypes.Account(transmitters[0].Hex()),
-		contractName,
-		methodTransmitWithSignatures,
-		ocr3HelperAddr.Hex(),
-		ocrimpls.ToCommitCalldata,
-	)
-	transmitterWithoutSigs := ocrimpls.XXXNewContractTransmitterTestsOnly[RI](
-		chainWriter,
-		ocrtypes.Account(transmitters[0].Hex()),
-		contractName,
-		methodTransmitWithoutSignatures,
-		ocr3HelperAddr.Hex(),
-		ocrimpls.ToExecCalldata,
-	)
-
-	return &testUniverse[RI]{
-		simClient:              simClient,
-		backend:                backend,
-		deployer:               owner,
-		transmitters:           transmitters,
-		signers:                signers,
-		wrapper:                wrapper,
-		transmitterWithSigs:    transmitterWithSigs,
-		transmitterWithoutSigs: transmitterWithoutSigs,
-		keyrings:               keyrings,
-		f:                      f,
-		db:                     db,
-		txm:                    txm,
-		gasEstimator:           gasEstimator,
-	}
-}
-
-func (uni testUniverse[RI]) SignReport(t *testing.T, configDigest ocrtypes.ConfigDigest, rwi ocr3types.ReportWithInfo[RI], seqNum uint64) []ocrtypes.AttributedOnchainSignature {
-	var attributedSigs []ocrtypes.AttributedOnchainSignature
-	for i := uint8(0); i < uni.f+1; i++ {
-		t.Log("signing report with", hexutil.Encode(uni.keyrings[i].PublicKey()))
-		sig, err := uni.keyrings[i].Sign(configDigest, seqNum, rwi)
-		require.NoError(t, err, "failed to sign report")
-		attributedSigs = append(attributedSigs, ocrtypes.AttributedOnchainSignature{
-			Signature: sig,
-			Signer:    commontypes.OracleID(i),
-		})
-	}
-	return attributedSigs
-}
-
-func (uni testUniverse[RI]) TransmittedEvents(t *testing.T) []*multi_ocr3_helper.MultiOCR3HelperTransmitted {
-	iter, err := uni.wrapper.FilterTransmitted(&bind.FilterOpts{
-		Start: 0,
-	}, nil)
-	require.NoError(t, err, "failed to create filter iterator")
-	var events []*multi_ocr3_helper.MultiOCR3HelperTransmitted
-	for iter.Next() {
-		event := iter.Event
-		events = append(events, event)
-	}
-	return events
-}
-
-func randomReport(t *testing.T, len int) []byte {
-	report := make([]byte, len)
-	_, err := rand.Reader.Read(report)
-	require.NoError(t, err, "failed to read random bytes")
-	return report
-}
-
-const (
-	contractName                    = "MultiOCR3Helper"
-	methodTransmitWithSignatures    = "TransmitWithSignatures"
-	methodTransmitWithoutSignatures = "TransmitWithoutSignatures"
-)
-
-func chainWriterConfigRaw(fromAddress common.Address, maxGasPrice *assets.Wei) evmrelaytypes.ChainWriterConfig {
-	return evmrelaytypes.ChainWriterConfig{
-		Contracts: map[string]*evmrelaytypes.ContractConfig{
-			contractName: {
-				ContractABI: multi_ocr3_helper.MultiOCR3HelperABI,
-				Configs: map[string]*evmrelaytypes.ChainWriterDefinition{
-					methodTransmitWithSignatures: {
-						ChainSpecificName: "transmitWithSignatures",
-						GasLimit:          1e6,
-						FromAddress:       fromAddress,
-					},
-					methodTransmitWithoutSignatures: {
-						ChainSpecificName: "transmitWithoutSignatures",
-						GasLimit:          1e6,
-						FromAddress:       fromAddress,
-					},
-				},
-			},
-		},
-		SendStrategy: txmgrcommon.NewSendEveryStrategy(),
-		MaxGasPrice:  maxGasPrice,
-	}
-}
-
-func makeTestEvmTxm(
-	t *testing.T,
-	db *sqlx.DB,
-	ethClient client.Client,
-	keyStore keystore.Eth) (txmgr.TxManager, gas.EvmFeeEstimator) {
-	config, dbConfig, evmConfig := MakeTestConfigs(t)
-
-	estimator, err := gas.NewEstimator(logger.TestLogger(t), ethClient, config, evmConfig.GasEstimator())
-	require.NoError(t, err, "failed to create gas estimator")
-
-	lggr := logger.TestLogger(t)
-	lpOpts := logpoller.Opts{
-		PollPeriod:               100 * time.Millisecond,
-		FinalityDepth:            2,
-		BackfillBatchSize:        3,
-		RpcBatchSize:             2,
-		KeepFinalizedBlocksDepth: 1000,
-	}
-
-	chainID := big.NewInt(1337)
-	headSaver := headtracker.NewHeadSaver(
-		logger.NullLogger,
-		headtracker.NewORM(*chainID, db),
-		evmConfig,
-		evmConfig.HeadTrackerConfig,
-	)
-
-	broadcaster := headtracker.NewHeadBroadcaster(logger.NullLogger)
-	require.NoError(t, broadcaster.Start(testutils.Context(t)), "failed to start head broadcaster")
-	t.Cleanup(func() { require.NoError(t, broadcaster.Close()) })
-
-	ht := headtracker.NewHeadTracker(
-		logger.NullLogger,
-		ethClient,
-		evmConfig,
-		evmConfig.HeadTrackerConfig,
-		broadcaster,
-		headSaver,
-		mailbox.NewMonitor("contract_transmitter_test", logger.NullLogger),
-	)
-	require.NoError(t, ht.Start(testutils.Context(t)), "failed to start head tracker")
-	t.Cleanup(func() { require.NoError(t, ht.Close()) })
-
-	lp := logpoller.NewLogPoller(logpoller.NewORM(testutils.FixtureChainID, db, logger.NullLogger),
-		ethClient, logger.NullLogger, ht, lpOpts)
-	require.NoError(t, lp.Start(testutils.Context(t)), "failed to start log poller")
-	t.Cleanup(func() { require.NoError(t, lp.Close()) })
-
-	// logic for building components (from evm/evm_txm.go) -------
-	lggr.Infow("Initializing EVM transaction manager",
-		"bumpTxDepth", evmConfig.GasEstimator().BumpTxDepth(),
-		"maxInFlightTransactions", config.EvmConfig.Transactions().MaxInFlight(),
-		"maxQueuedTransactions", config.EvmConfig.Transactions().MaxQueued(),
-		"nonceAutoSync", evmConfig.NonceAutoSync(),
-		"limitDefault", evmConfig.GasEstimator().LimitDefault(),
-	)
-
-	txm, err := txmgr.NewTxm(
-		db,
-		config,
-		config.EvmConfig.GasEstimator(),
-		config.EvmConfig.Transactions(),
-		nil,
-		dbConfig,
-		dbConfig.Listener(),
-		ethClient,
-		lggr,
-		lp,
-		keyStore,
-		estimator)
-	require.NoError(t, err, "can't create tx manager")
-
-	_, unsub := broadcaster.Subscribe(txm)
-	t.Cleanup(unsub)
-
-	return txm, estimator
-}
-
-// Code below copied/pasted and slightly modified in order to work from core/chains/evm/txmgr/test_helpers.go.
-
-func ptr[T any](t T) *T { return &t }
-
-type TestDatabaseConfig struct {
-	config.Database
-	defaultQueryTimeout time.Duration
-}
-
-func (d *TestDatabaseConfig) DefaultQueryTimeout() time.Duration {
-	return d.defaultQueryTimeout
-}
-
-func (d *TestDatabaseConfig) LogSQL() bool {
-	return false
-}
-
-type TestListenerConfig struct {
-	config.Listener
-}
-
-func (l *TestListenerConfig) FallbackPollInterval() time.Duration {
-	return 1 * time.Minute
-}
-
-func (d *TestDatabaseConfig) Listener() config.Listener {
-	return &TestListenerConfig{}
-}
-
-type TestHeadTrackerConfig struct{}
-
-// FinalityTagBypass implements config.HeadTracker.
-func (t *TestHeadTrackerConfig) FinalityTagBypass() bool {
-	return false
-}
-
-// HistoryDepth implements config.HeadTracker.
-func (t *TestHeadTrackerConfig) HistoryDepth() uint32 {
-	return 50
-}
-
-// MaxAllowedFinalityDepth implements config.HeadTracker.
-func (t *TestHeadTrackerConfig) MaxAllowedFinalityDepth() uint32 {
-	return 100
-}
-
-// MaxBufferSize implements config.HeadTracker.
-func (t *TestHeadTrackerConfig) MaxBufferSize() uint32 {
-	return 100
-}
-
-// SamplingInterval implements config.HeadTracker.
-func (t *TestHeadTrackerConfig) SamplingInterval() time.Duration {
-	return 1 * time.Second
-}
-
-var _ evmconfig.HeadTracker = (*TestHeadTrackerConfig)(nil)
-
-type TestEvmConfig struct {
-	evmconfig.EVM
-	HeadTrackerConfig    evmconfig.HeadTracker
-	MaxInFlight          uint32
-	ReaperInterval       time.Duration
-	ReaperThreshold      time.Duration
-	ResendAfterThreshold time.Duration
-	BumpThreshold        uint64
-	MaxQueued            uint64
-	Enabled              bool
-	Threshold            uint32
-	MinAttempts          uint32
-	DetectionApiUrl      *url.URL
-}
-
-func (e *TestEvmConfig) FinalityTagEnabled() bool {
-	return false
-}
-
-func (e *TestEvmConfig) FinalityDepth() uint32 {
-	return 42
-}
-
-func (e *TestEvmConfig) FinalizedBlockOffset() uint32 {
-	return 42
-}
-
-func (e *TestEvmConfig) BlockEmissionIdleWarningThreshold() time.Duration {
-	return 10 * time.Second
-}
-
-func (e *TestEvmConfig) Transactions() evmconfig.Transactions {
-	return &transactionsConfig{e: e, autoPurge: &autoPurgeConfig{}}
-}
-
-func (e *TestEvmConfig) NonceAutoSync() bool { return true }
-
-func (e *TestEvmConfig) ChainType() chaintype.ChainType { return "" }
-
-type TestGasEstimatorConfig struct {
-	bumpThreshold uint64
-}
-
-func (g *TestGasEstimatorConfig) BlockHistory() evmconfig.BlockHistory {
-	return &TestBlockHistoryConfig{}
-}
-
-func (g *TestGasEstimatorConfig) EIP1559DynamicFees() bool   { return false }
-func (g *TestGasEstimatorConfig) LimitDefault() uint64       { return 1e6 }
-func (g *TestGasEstimatorConfig) BumpPercent() uint16        { return 2 }
-func (g *TestGasEstimatorConfig) BumpThreshold() uint64      { return g.bumpThreshold }
-func (g *TestGasEstimatorConfig) BumpMin() *assets.Wei       { return assets.GWei(1) }
-func (g *TestGasEstimatorConfig) FeeCapDefault() *assets.Wei { return assets.GWei(1) }
-func (g *TestGasEstimatorConfig) PriceDefault() *assets.Wei  { return assets.GWei(1) }
-func (g *TestGasEstimatorConfig) TipCapDefault() *assets.Wei { return assets.GWei(1) }
-func (g *TestGasEstimatorConfig) TipCapMin() *assets.Wei     { return assets.GWei(1) }
-func (g *TestGasEstimatorConfig) LimitMax() uint64           { return 0 }
-func (g *TestGasEstimatorConfig) LimitMultiplier() float32   { return 1 }
-func (g *TestGasEstimatorConfig) BumpTxDepth() uint32        { return 42 }
-func (g *TestGasEstimatorConfig) LimitTransfer() uint64      { return 42 }
-func (g *TestGasEstimatorConfig) PriceMax() *assets.Wei      { return assets.GWei(1) }
-func (g *TestGasEstimatorConfig) PriceMin() *assets.Wei      { return assets.GWei(1) }
-func (g *TestGasEstimatorConfig) Mode() string               { return "FixedPrice" }
-func (g *TestGasEstimatorConfig) LimitJobType() evmconfig.LimitJobType {
-	return &TestLimitJobTypeConfig{}
-}
-func (g *TestGasEstimatorConfig) PriceMaxKey(addr common.Address) *assets.Wei {
-	return assets.GWei(1)
-}
-
-func (e *TestEvmConfig) GasEstimator() evmconfig.GasEstimator {
-	return &TestGasEstimatorConfig{bumpThreshold: e.BumpThreshold}
-}
-
-type TestLimitJobTypeConfig struct {
-}
-
-func (l *TestLimitJobTypeConfig) OCR() *uint32    { return ptr(uint32(0)) }
-func (l *TestLimitJobTypeConfig) OCR2() *uint32   { return ptr(uint32(0)) }
-func (l *TestLimitJobTypeConfig) DR() *uint32     { return ptr(uint32(0)) }
-func (l *TestLimitJobTypeConfig) FM() *uint32     { return ptr(uint32(0)) }
-func (l *TestLimitJobTypeConfig) Keeper() *uint32 { return ptr(uint32(0)) }
-func (l *TestLimitJobTypeConfig) VRF() *uint32    { return ptr(uint32(0)) }
-
-type TestBlockHistoryConfig struct {
-	evmconfig.BlockHistory
-}
-
-func (b *TestBlockHistoryConfig) BatchSize() uint32                 { return 42 }
-func (b *TestBlockHistoryConfig) BlockDelay() uint16                { return 42 }
-func (b *TestBlockHistoryConfig) BlockHistorySize() uint16          { return 42 }
-func (b *TestBlockHistoryConfig) EIP1559FeeCapBufferBlocks() uint16 { return 42 }
-func (b *TestBlockHistoryConfig) TransactionPercentile() uint16     { return 42 }
-
-type transactionsConfig struct {
-	evmconfig.Transactions
-	e         *TestEvmConfig
-	autoPurge evmconfig.AutoPurgeConfig
-}
-
-func (*transactionsConfig) ForwardersEnabled() bool                { return false }
-func (t *transactionsConfig) MaxInFlight() uint32                  { return t.e.MaxInFlight }
-func (t *transactionsConfig) MaxQueued() uint64                    { return t.e.MaxQueued }
-func (t *transactionsConfig) ReaperInterval() time.Duration        { return t.e.ReaperInterval }
-func (t *transactionsConfig) ReaperThreshold() time.Duration       { return t.e.ReaperThreshold }
-func (t *transactionsConfig) ResendAfterThreshold() time.Duration  { return t.e.ResendAfterThreshold }
-func (t *transactionsConfig) AutoPurge() evmconfig.AutoPurgeConfig { return t.autoPurge }
-
-type autoPurgeConfig struct {
-	evmconfig.AutoPurgeConfig
-}
-
-func (a *autoPurgeConfig) Enabled() bool { return false }
-
-type MockConfig struct {
-	EvmConfig           *TestEvmConfig
-	RpcDefaultBatchSize uint32
-	finalityDepth       uint32
-	finalityTagEnabled  bool
-}
-
-func (c *MockConfig) EVM() evmconfig.EVM {
-	return c.EvmConfig
-}
-
-func (c *MockConfig) NonceAutoSync() bool            { return true }
-func (c *MockConfig) ChainType() chaintype.ChainType { return "" }
-func (c *MockConfig) FinalityDepth() uint32          { return c.finalityDepth }
-func (c *MockConfig) SetFinalityDepth(fd uint32)     { c.finalityDepth = fd }
-func (c *MockConfig) FinalityTagEnabled() bool       { return c.finalityTagEnabled }
-func (c *MockConfig) RPCDefaultBatchSize() uint32    { return c.RpcDefaultBatchSize }
-
-func MakeTestConfigs(t *testing.T) (*MockConfig, *TestDatabaseConfig, *TestEvmConfig) {
-	db := &TestDatabaseConfig{defaultQueryTimeout: utils.DefaultQueryTimeout}
-	ec := &TestEvmConfig{
-		HeadTrackerConfig: &TestHeadTrackerConfig{},
-		BumpThreshold:     42,
-		MaxInFlight:       uint32(42),
-		MaxQueued:         uint64(0),
-		ReaperInterval:    time.Duration(0),
-		ReaperThreshold:   time.Duration(0),
-	}
-	config := &MockConfig{EvmConfig: ec}
-	return config, db, ec
-}
diff --git a/core/capabilities/ccip/ocrimpls/keyring.go b/core/capabilities/ccip/ocrimpls/keyring.go
deleted file mode 100644
index 4b15c75b09..0000000000
--- a/core/capabilities/ccip/ocrimpls/keyring.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package ocrimpls
-
-import (
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-)
-
-var _ ocr3types.OnchainKeyring[[]byte] = &ocr3Keyring[[]byte]{}
-
-type ocr3Keyring[RI any] struct {
-	core types.OnchainKeyring
-	lggr logger.Logger
-}
-
-func NewOnchainKeyring[RI any](keyring types.OnchainKeyring, lggr logger.Logger) *ocr3Keyring[RI] {
-	return &ocr3Keyring[RI]{
-		core: keyring,
-		lggr: lggr.Named("OCR3Keyring"),
-	}
-}
-
-func (w *ocr3Keyring[RI]) PublicKey() types.OnchainPublicKey {
-	return w.core.PublicKey()
-}
-
-func (w *ocr3Keyring[RI]) MaxSignatureLength() int {
-	return w.core.MaxSignatureLength()
-}
-
-func (w *ocr3Keyring[RI]) Sign(configDigest types.ConfigDigest, seqNr uint64, r ocr3types.ReportWithInfo[RI]) (signature []byte, err error) {
-	epoch, round := uint64ToUint32AndUint8(seqNr)
-	rCtx := types.ReportContext{
-		ReportTimestamp: types.ReportTimestamp{
-			ConfigDigest: configDigest,
-			Epoch:        epoch,
-			Round:        round,
-		},
-	}
-
-	w.lggr.Debugw("signing report", "configDigest", configDigest.Hex(), "seqNr", seqNr, "report", hexutil.Encode(r.Report))
-
-	return w.core.Sign(rCtx, r.Report)
-}
-
-func (w *ocr3Keyring[RI]) Verify(key types.OnchainPublicKey, configDigest types.ConfigDigest, seqNr uint64, r ocr3types.ReportWithInfo[RI], signature []byte) bool {
-	epoch, round := uint64ToUint32AndUint8(seqNr)
-	rCtx := types.ReportContext{
-		ReportTimestamp: types.ReportTimestamp{
-			ConfigDigest: configDigest,
-			Epoch:        epoch,
-			Round:        round,
-		},
-	}
-
-	w.lggr.Debugw("verifying report", "configDigest", configDigest.Hex(), "seqNr", seqNr, "report", hexutil.Encode(r.Report))
-
-	return w.core.Verify(key, rCtx, r.Report, signature)
-}
diff --git a/core/capabilities/ccip/oraclecreator/inprocess.go b/core/capabilities/ccip/oraclecreator/inprocess.go
deleted file mode 100644
index 266ffc2d77..0000000000
--- a/core/capabilities/ccip/oraclecreator/inprocess.go
+++ /dev/null
@@ -1,374 +0,0 @@
-package oraclecreator
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ccipevm"
-	evmconfig "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ocrimpls"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/superfakes"
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/google/uuid"
-	"github.com/prometheus/client_golang/prometheus"
-
-	chainsel "github.com/smartcontractkit/chain-selectors"
-
-	"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
-	"github.com/smartcontractkit/chainlink-ccip/pluginconfig"
-
-	"github.com/smartcontractkit/libocr/commontypes"
-	libocr3 "github.com/smartcontractkit/libocr/offchainreporting2plus"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
-	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-
-	commitocr3 "github.com/smartcontractkit/chainlink-ccip/commitrmnocb"
-	execocr3 "github.com/smartcontractkit/chainlink-ccip/execute"
-	ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/types"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/job"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/services/synchronization"
-	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
-)
-
-var _ cctypes.OracleCreator = &inprocessOracleCreator{}
-
-const (
-	defaultCommitGasLimit = 500_000
-)
-
-// inprocessOracleCreator creates oracles that reference plugins running
-// in the same process as the chainlink node, i.e not LOOPPs.
-type inprocessOracleCreator struct {
-	ocrKeyBundles         map[string]ocr2key.KeyBundle
-	transmitters          map[types.RelayID][]string
-	chains                legacyevm.LegacyChainContainer
-	peerWrapper           *ocrcommon.SingletonPeerWrapper
-	externalJobID         uuid.UUID
-	jobID                 int32
-	isNewlyCreatedJob     bool
-	pluginConfig          job.JSONConfig
-	db                    ocr3types.Database
-	lggr                  logger.Logger
-	monitoringEndpointGen telemetry.MonitoringEndpointGenerator
-	bootstrapperLocators  []commontypes.BootstrapperLocator
-	homeChainReader       ccipreaderpkg.HomeChain
-}
-
-func New(
-	ocrKeyBundles map[string]ocr2key.KeyBundle,
-	transmitters map[types.RelayID][]string,
-	chains legacyevm.LegacyChainContainer,
-	peerWrapper *ocrcommon.SingletonPeerWrapper,
-	externalJobID uuid.UUID,
-	jobID int32,
-	isNewlyCreatedJob bool,
-	pluginConfig job.JSONConfig,
-	db ocr3types.Database,
-	lggr logger.Logger,
-	monitoringEndpointGen telemetry.MonitoringEndpointGenerator,
-	bootstrapperLocators []commontypes.BootstrapperLocator,
-	homeChainReader ccipreaderpkg.HomeChain,
-) cctypes.OracleCreator {
-	return &inprocessOracleCreator{
-		ocrKeyBundles:         ocrKeyBundles,
-		transmitters:          transmitters,
-		chains:                chains,
-		peerWrapper:           peerWrapper,
-		externalJobID:         externalJobID,
-		jobID:                 jobID,
-		isNewlyCreatedJob:     isNewlyCreatedJob,
-		pluginConfig:          pluginConfig,
-		db:                    db,
-		lggr:                  lggr,
-		monitoringEndpointGen: monitoringEndpointGen,
-		bootstrapperLocators:  bootstrapperLocators,
-		homeChainReader:       homeChainReader,
-	}
-}
-
-// CreateBootstrapOracle implements types.OracleCreator.
-func (i *inprocessOracleCreator) CreateBootstrapOracle(config cctypes.OCR3ConfigWithMeta) (cctypes.CCIPOracle, error) {
-	// Assuming that the chain selector is referring to an evm chain for now.
-	// TODO: add an api that returns chain family.
-	chainID, err := chainsel.ChainIdFromSelector(uint64(config.Config.ChainSelector))
-	if err != nil {
-		return nil, fmt.Errorf("failed to get chain ID from selector: %w", err)
-	}
-
-	destChainFamily := chaintype.EVM
-	destRelayID := types.NewRelayID(string(destChainFamily), fmt.Sprintf("%d", chainID))
-
-	bootstrapperArgs := libocr3.BootstrapperArgs{
-		BootstrapperFactory:   i.peerWrapper.Peer2,
-		V2Bootstrappers:       i.bootstrapperLocators,
-		ContractConfigTracker: ocrimpls.NewConfigTracker(config),
-		Database:              i.db,
-		LocalConfig:           defaultLocalConfig(),
-		Logger: ocrcommon.NewOCRWrapper(
-			i.lggr.
-				Named("CCIPBootstrap").
-				Named(destRelayID.String()).
-				Named(config.Config.ChainSelector.String()).
-				Named(hexutil.Encode(config.Config.OfframpAddress)),
-			false, /* traceLogging */
-			func(ctx context.Context, msg string) {}),
-		MonitoringEndpoint: i.monitoringEndpointGen.GenMonitoringEndpoint(
-			string(destChainFamily),
-			destRelayID.ChainID,
-			hexutil.Encode(config.Config.OfframpAddress),
-			synchronization.OCR3CCIPBootstrap,
-		),
-		OffchainConfigDigester: ocrimpls.NewConfigDigester(config.ConfigDigest),
-	}
-	bootstrapper, err := libocr3.NewBootstrapper(bootstrapperArgs)
-	if err != nil {
-		return nil, err
-	}
-	return bootstrapper, nil
-}
-
-// CreatePluginOracle implements types.OracleCreator.
-func (i *inprocessOracleCreator) CreatePluginOracle(pluginType cctypes.PluginType, config cctypes.OCR3ConfigWithMeta) (cctypes.CCIPOracle, error) {
-	// Assuming that the chain selector is referring to an evm chain for now.
-	// TODO: add an api that returns chain family.
-	destChainID, err := chainsel.ChainIdFromSelector(uint64(config.Config.ChainSelector))
-	if err != nil {
-		return nil, fmt.Errorf("failed to get chain ID from selector %d: %w", config.Config.ChainSelector, err)
-	}
-	destChainFamily := relay.NetworkEVM
-	destRelayID := types.NewRelayID(destChainFamily, fmt.Sprintf("%d", destChainID))
-
-	configTracker := ocrimpls.NewConfigTracker(config)
-	publicConfig, err := configTracker.PublicConfig()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get public config from OCR config: %w", err)
-	}
-	var execBatchGasLimit uint64
-	if pluginType == cctypes.PluginTypeCCIPExec {
-		execOffchainConfig, err2 := pluginconfig.DecodeExecuteOffchainConfig(publicConfig.ReportingPluginConfig)
-		if err2 != nil {
-			return nil, fmt.Errorf("failed to decode execute offchain config: %w, raw: %s",
-				err2, string(publicConfig.ReportingPluginConfig))
-		}
-		if execOffchainConfig.BatchGasLimit == 0 && destChainFamily == relay.NetworkEVM {
-			return nil, fmt.Errorf("BatchGasLimit not set in execute offchain config, must be > 0")
-		}
-		execBatchGasLimit = execOffchainConfig.BatchGasLimit
-	}
-
-	// this is so that we can use the msg hasher and report encoder from that dest chain relayer's provider.
-	contractReaders := make(map[cciptypes.ChainSelector]types.ContractReader)
-	chainWriters := make(map[cciptypes.ChainSelector]types.ChainWriter)
-	for _, chain := range i.chains.Slice() {
-		var chainReaderConfig evmrelaytypes.ChainReaderConfig
-		if chain.ID().Uint64() == destChainID {
-			chainReaderConfig = evmconfig.DestReaderConfig()
-		} else {
-			chainReaderConfig = evmconfig.SourceReaderConfig()
-		}
-		cr, err2 := evm.NewChainReaderService(
-			context.Background(),
-			i.lggr.
-				Named("EVMChainReaderService").
-				Named(chain.ID().String()).
-				Named(pluginType.String()),
-			chain.LogPoller(),
-			chain.HeadTracker(),
-			chain.Client(),
-			chainReaderConfig,
-		)
-		if err2 != nil {
-			return nil, fmt.Errorf("failed to create contract reader for chain %s: %w", chain.ID(), err2)
-		}
-
-		if chain.ID().Uint64() == destChainID {
-			// bind the chain reader to the dest chain's offramp.
-			offrampAddressHex := common.BytesToAddress(config.Config.OfframpAddress).Hex()
-			err3 := cr.Bind(context.Background(), []types.BoundContract{
-				{
-					Address: offrampAddressHex,
-					Name:    consts.ContractNameOffRamp,
-				},
-			})
-			if err3 != nil {
-				return nil, fmt.Errorf("failed to bind chain reader for dest chain %s's offramp at %s: %w", chain.ID(), offrampAddressHex, err3)
-			}
-		}
-
-		// TODO: figure out shutdown.
-		// maybe from the plugin directly?
-		err2 = cr.Start(context.Background())
-		if err2 != nil {
-			return nil, fmt.Errorf("failed to start contract reader for chain %s: %w", chain.ID(), err2)
-		}
-
-		// Even though we only write to the dest chain, we need to create chain writers for all chains
-		// we know about in order to post gas prices on the dest.
-		var fromAddress common.Address
-		transmitter, ok := i.transmitters[types.NewRelayID(relay.NetworkEVM, chain.ID().String())]
-		if ok {
-			fromAddress = common.HexToAddress(transmitter[0])
-		}
-		cw, err2 := evm.NewChainWriterService(
-			i.lggr.Named("EVMChainWriterService").
-				Named(chain.ID().String()).
-				Named(pluginType.String()),
-			chain.Client(),
-			chain.TxManager(),
-			chain.GasEstimator(),
-			evmconfig.ChainWriterConfigRaw(
-				fromAddress,
-				chain.Config().EVM().GasEstimator().PriceMaxKey(fromAddress),
-				defaultCommitGasLimit,
-				execBatchGasLimit,
-			),
-		)
-		if err2 != nil {
-			return nil, fmt.Errorf("failed to create chain writer for chain %s: %w", chain.ID(), err2)
-		}
-
-		// TODO: figure out shutdown.
-		// maybe from the plugin directly?
-		err2 = cw.Start(context.Background())
-		if err2 != nil {
-			return nil, fmt.Errorf("failed to start chain writer for chain %s: %w", chain.ID(), err2)
-		}
-
-		chainSelector, ok := chainsel.EvmChainIdToChainSelector()[chain.ID().Uint64()]
-		if !ok {
-			return nil, fmt.Errorf("failed to get chain selector from chain ID %s", chain.ID())
-		}
-
-		contractReaders[cciptypes.ChainSelector(chainSelector)] = cr
-		chainWriters[cciptypes.ChainSelector(chainSelector)] = cw
-	}
-
-	// build the onchain keyring. it will be the signing key for the destination chain family.
-	keybundle, ok := i.ocrKeyBundles[destChainFamily]
-	if !ok {
-		return nil, fmt.Errorf("no OCR key bundle found for chain family %s, forgot to create one?", destChainFamily)
-	}
-	onchainKeyring := ocrimpls.NewOnchainKeyring[[]byte](keybundle, i.lggr)
-
-	// build the contract transmitter
-	// assume that we are using the first account in the keybundle as the from account
-	// and that we are able to transmit to the dest chain.
-	// TODO: revisit this in the future, since not all oracles will be able to transmit to the dest chain.
-	destChainWriter, ok := chainWriters[config.Config.ChainSelector]
-	if !ok {
-		return nil, fmt.Errorf("no chain writer found for dest chain selector %d, can't create contract transmitter",
-			config.Config.ChainSelector)
-	}
-	destFromAccounts, ok := i.transmitters[destRelayID]
-	if !ok {
-		return nil, fmt.Errorf("no transmitter found for dest relay ID %s, can't create contract transmitter", destRelayID)
-	}
-
-	// TODO: Extract the correct transmitter address from the destsFromAccount
-	var factory ocr3types.ReportingPluginFactory[[]byte]
-	var transmitter ocr3types.ContractTransmitter[[]byte]
-	if config.Config.PluginType == uint8(cctypes.PluginTypeCCIPCommit) {
-		factory = commitocr3.NewPluginFactory(
-			i.lggr.
-				Named("CCIPCommitPlugin").
-				Named(destRelayID.String()).
-				Named(fmt.Sprintf("%d", config.Config.ChainSelector)).
-				Named(hexutil.Encode(config.Config.OfframpAddress)),
-			ccipreaderpkg.OCR3ConfigWithMeta(config),
-			ccipevm.NewCommitPluginCodecV1(),
-			ccipevm.NewMessageHasherV1(),
-			i.homeChainReader,
-			contractReaders,
-			chainWriters,
-		)
-		transmitter = ocrimpls.NewCommitContractTransmitter[[]byte](destChainWriter,
-			ocrtypes.Account(destFromAccounts[0]),
-			hexutil.Encode(config.Config.OfframpAddress), // TODO: this works for evm only, how about non-evm?
-		)
-	} else if config.Config.PluginType == uint8(cctypes.PluginTypeCCIPExec) {
-		factory = execocr3.NewPluginFactory(
-			i.lggr.
-				Named("CCIPExecPlugin").
-				Named(destRelayID.String()).
-				Named(hexutil.Encode(config.Config.OfframpAddress)),
-			ccipreaderpkg.OCR3ConfigWithMeta(config),
-			ccipevm.NewExecutePluginCodecV1(),
-			ccipevm.NewMessageHasherV1(),
-			i.homeChainReader,
-			superfakes.NewNilTokenDataReader(),
-			ccipevm.NewGasEstimateProvider(), // TODO: this works for evm only, how about non-evm?
-			contractReaders,
-			chainWriters,
-		)
-		transmitter = ocrimpls.NewExecContractTransmitter[[]byte](destChainWriter,
-			ocrtypes.Account(destFromAccounts[0]),
-			hexutil.Encode(config.Config.OfframpAddress), // TODO: this works for evm only, how about non-evm?
-		)
-	} else {
-		return nil, fmt.Errorf("unsupported plugin type %d", config.Config.PluginType)
-	}
-
-	oracleArgs := libocr3.OCR3OracleArgs[[]byte]{
-		BinaryNetworkEndpointFactory: i.peerWrapper.Peer2,
-		Database:                     i.db,
-		V2Bootstrappers:              i.bootstrapperLocators,
-		ContractConfigTracker:        configTracker,
-		ContractTransmitter:          transmitter,
-		LocalConfig:                  defaultLocalConfig(),
-		Logger: ocrcommon.NewOCRWrapper(
-			i.lggr.
-				Named(fmt.Sprintf("CCIP%sOCR3", pluginType.String())).
-				Named(destRelayID.String()).
-				Named(hexutil.Encode(config.Config.OfframpAddress)),
-			false,
-			func(ctx context.Context, msg string) {}),
-		MetricsRegisterer: prometheus.WrapRegistererWith(map[string]string{"name": fmt.Sprintf("commit-%d", config.Config.ChainSelector)}, prometheus.DefaultRegisterer),
-		MonitoringEndpoint: i.monitoringEndpointGen.GenMonitoringEndpoint(
-			destChainFamily,
-			destRelayID.ChainID,
-			string(config.Config.OfframpAddress),
-			synchronization.OCR3CCIPCommit,
-		),
-		OffchainConfigDigester: ocrimpls.NewConfigDigester(config.ConfigDigest),
-		OffchainKeyring:        keybundle,
-		OnchainKeyring:         onchainKeyring,
-		ReportingPluginFactory: factory,
-	}
-	oracle, err := libocr3.NewOracle(oracleArgs)
-	if err != nil {
-		return nil, err
-	}
-	return oracle, nil
-}
-
-func defaultLocalConfig() ocrtypes.LocalConfig {
-	return ocrtypes.LocalConfig{
-		BlockchainTimeout: 10 * time.Second,
-		// Config tracking is handled by the launcher, since we're doing blue-green
-		// deployments we're not going to be using OCR's built-in config switching,
-		// which always shuts down the previous instance.
-		ContractConfigConfirmations:        1,
-		SkipContractConfigConfirmations:    true,
-		ContractConfigTrackerPollInterval:  10 * time.Second,
-		ContractTransmitterTransmitTimeout: 10 * time.Second,
-		DatabaseTimeout:                    10 * time.Second,
-		MinOCR2MaxDurationQuery:            1 * time.Second,
-		DevelopmentMode:                    "false",
-	}
-}
diff --git a/core/capabilities/ccip/oraclecreator/inprocess_test.go b/core/capabilities/ccip/oraclecreator/inprocess_test.go
deleted file mode 100644
index 639f01e62e..0000000000
--- a/core/capabilities/ccip/oraclecreator/inprocess_test.go
+++ /dev/null
@@ -1,239 +0,0 @@
-package oraclecreator_test
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/oraclecreator"
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/google/uuid"
-	"github.com/hashicorp/consul/sdk/freeport"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gopkg.in/guregu/null.v4"
-
-	chainsel "github.com/smartcontractkit/chain-selectors"
-	"github.com/smartcontractkit/libocr/offchainreporting2/types"
-	confighelper2 "github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3confighelper"
-
-	"github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
-
-	"github.com/smartcontractkit/libocr/commontypes"
-
-	"github.com/smartcontractkit/chainlink/v2/core/bridges"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"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"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2"
-	ocr2validate "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/validate"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-	"github.com/smartcontractkit/chainlink/v2/core/services/synchronization"
-	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
-	"github.com/smartcontractkit/chainlink/v2/core/testdata/testspecs"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
-)
-
-func TestOracleCreator_CreateBootstrap(t *testing.T) {
-	db := pgtest.NewSqlxDB(t)
-
-	keyStore := keystore.New(db, utils.DefaultScryptParams, logger.NullLogger)
-	require.NoError(t, keyStore.Unlock(testutils.Context(t), cltest.Password), "unable to unlock keystore")
-	p2pKey, err := keyStore.P2P().Create(testutils.Context(t))
-	require.NoError(t, err)
-	peerID := p2pKey.PeerID()
-	listenPort := freeport.GetOne(t)
-	generalConfig := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-		c.P2P.PeerID = ptr(peerID)
-		c.P2P.TraceLogging = ptr(false)
-		c.P2P.V2.Enabled = ptr(true)
-		c.P2P.V2.ListenAddresses = ptr([]string{fmt.Sprintf("127.0.0.1:%d", listenPort)})
-
-		c.OCR2.Enabled = ptr(true)
-	})
-	peerWrapper := ocrcommon.NewSingletonPeerWrapper(keyStore, generalConfig.P2P(), generalConfig.OCR(), db, logger.NullLogger)
-	require.NoError(t, peerWrapper.Start(testutils.Context(t)))
-	t.Cleanup(func() { assert.NoError(t, peerWrapper.Close()) })
-
-	// NOTE: this is a bit of a hack to get the OCR2 job created in order to use the ocr db
-	// the ocr2_contract_configs table has a foreign key constraint on ocr2_oracle_spec_id
-	// which is passed into ocr2.NewDB.
-	pipelineORM := pipeline.NewORM(db,
-		logger.NullLogger, generalConfig.JobPipeline().MaxSuccessfulRuns())
-	bridgesORM := bridges.NewORM(db)
-
-	jobORM := job.NewORM(db, pipelineORM, bridgesORM, keyStore, logger.TestLogger(t))
-	t.Cleanup(func() { assert.NoError(t, jobORM.Close()) })
-
-	jb, err := ocr2validate.ValidatedOracleSpecToml(testutils.Context(t), generalConfig.OCR2(), generalConfig.Insecure(), testspecs.GetOCR2EVMSpecMinimal(), nil)
-	require.NoError(t, err)
-	const juelsPerFeeCoinSource = `
-	ds          [type=http method=GET url="https://chain.link/ETH-USD"];
-	ds_parse    [type=jsonparse path="data.price" separator="."];
-	ds_multiply [type=multiply times=100];
-	ds -> ds_parse -> ds_multiply;`
-
-	_, address := cltest.MustInsertRandomKey(t, keyStore.Eth())
-	jb.Name = null.StringFrom("Job 1")
-	jb.OCR2OracleSpec.TransmitterID = null.StringFrom(address.String())
-	jb.OCR2OracleSpec.PluginConfig["juelsPerFeeCoinSource"] = juelsPerFeeCoinSource
-
-	err = jobORM.CreateJob(testutils.Context(t), &jb)
-	require.NoError(t, err)
-
-	cltest.AssertCount(t, db, "ocr2_oracle_specs", 1)
-	cltest.AssertCount(t, db, "jobs", 1)
-
-	var oracleSpecID int32
-	err = db.Get(&oracleSpecID, "SELECT id FROM ocr2_oracle_specs LIMIT 1")
-	require.NoError(t, err)
-
-	ocrdb := ocr2.NewDB(db, oracleSpecID, 0, logger.NullLogger)
-
-	oc := oraclecreator.New(
-		nil,
-		nil,
-		nil,
-		peerWrapper,
-		uuid.Max,
-		0,
-		false,
-		nil,
-		ocrdb,
-		logger.TestLogger(t),
-		&mockEndpointGen{},
-		[]commontypes.BootstrapperLocator{},
-		nil,
-	)
-
-	chainSelector := chainsel.GETH_TESTNET.Selector
-	oracles, offchainConfig := ocrOffchainConfig(t, keyStore)
-	bootstrapP2PID, err := p2pkey.MakePeerID(oracles[0].PeerID)
-	require.NoError(t, err)
-	transmitters := func() [][]byte {
-		var transmitters [][]byte
-		for _, o := range oracles {
-			transmitters = append(transmitters, hexutil.MustDecode(string(o.TransmitAccount)))
-		}
-		return transmitters
-	}()
-	configDigest := ccipConfigDigest()
-	bootstrap, err := oc.CreateBootstrapOracle(cctypes.OCR3ConfigWithMeta{
-		ConfigDigest: configDigest,
-		ConfigCount:  1,
-		Config: reader.OCR3Config{
-			ChainSelector:         ccipocr3.ChainSelector(chainSelector),
-			OfframpAddress:        testutils.NewAddress().Bytes(),
-			PluginType:            uint8(cctypes.PluginTypeCCIPCommit),
-			F:                     1,
-			OffchainConfigVersion: 30,
-			BootstrapP2PIds:       [][32]byte{bootstrapP2PID},
-			P2PIds: func() [][32]byte {
-				var ids [][32]byte
-				for _, o := range oracles {
-					id, err2 := p2pkey.MakePeerID(o.PeerID)
-					require.NoError(t, err2)
-					ids = append(ids, id)
-				}
-				return ids
-			}(),
-			Signers: func() [][]byte {
-				var signers [][]byte
-				for _, o := range oracles {
-					signers = append(signers, o.OnchainPublicKey)
-				}
-				return signers
-			}(),
-			Transmitters:   transmitters,
-			OffchainConfig: offchainConfig,
-		},
-	})
-	require.NoError(t, err)
-	require.NoError(t, bootstrap.Start())
-	t.Cleanup(func() { assert.NoError(t, bootstrap.Close()) })
-
-	tests.AssertEventually(t, func() bool {
-		c, err := ocrdb.ReadConfig(testutils.Context(t))
-		require.NoError(t, err)
-		return c.ConfigDigest == configDigest
-	})
-}
-
-func ccipConfigDigest() [32]byte {
-	rand32Bytes := testutils.Random32Byte()
-	// overwrite first four bytes to be 0x000a, to match the prefix in libocr.
-	rand32Bytes[0] = 0x00
-	rand32Bytes[1] = 0x0a
-	return rand32Bytes
-}
-
-type mockEndpointGen struct{}
-
-func (m *mockEndpointGen) GenMonitoringEndpoint(network string, chainID string, contractID string, telemType synchronization.TelemetryType) commontypes.MonitoringEndpoint {
-	return &telemetry.NoopAgent{}
-}
-
-func ptr[T any](b T) *T {
-	return &b
-}
-
-func ocrOffchainConfig(t *testing.T, ks keystore.Master) (oracles []confighelper2.OracleIdentityExtra, offchainConfig []byte) {
-	for i := 0; i < 4; i++ {
-		kb, err := ks.OCR2().Create(testutils.Context(t), chaintype.EVM)
-		require.NoError(t, err)
-		p2pKey, err := ks.P2P().Create(testutils.Context(t))
-		require.NoError(t, err)
-		ethKey, err := ks.Eth().Create(testutils.Context(t))
-		require.NoError(t, err)
-		oracles = append(oracles, confighelper2.OracleIdentityExtra{
-			OracleIdentity: confighelper2.OracleIdentity{
-				OffchainPublicKey: kb.OffchainPublicKey(),
-				OnchainPublicKey:  types.OnchainPublicKey(kb.OnChainPublicKey()),
-				PeerID:            p2pKey.ID(),
-				TransmitAccount:   types.Account(ethKey.Address.Hex()),
-			},
-			ConfigEncryptionPublicKey: kb.ConfigEncryptionPublicKey(),
-		})
-	}
-	var schedule []int
-	for range oracles {
-		schedule = append(schedule, 1)
-	}
-	offchainConfig, onchainConfig := []byte{}, []byte{}
-	f := uint8(1)
-
-	_, _, _, _, _, offchainConfig, err := ocr3confighelper.ContractSetConfigArgsForTests(
-		30*time.Second, // deltaProgress
-		10*time.Second, // deltaResend
-		20*time.Second, // deltaInitial
-		2*time.Second,  // deltaRound
-		20*time.Second, // deltaGrace
-		10*time.Second, // deltaCertifiedCommitRequest
-		10*time.Second, // deltaStage
-		3,              // rmax
-		schedule,
-		oracles,
-		offchainConfig,
-		50*time.Millisecond, // maxDurationQuery
-		5*time.Second,       // maxDurationObservation
-		10*time.Second,      // maxDurationShouldAcceptAttestedReport
-		10*time.Second,      // maxDurationShouldTransmitAcceptedReport
-		int(f),
-		onchainConfig)
-	require.NoError(t, err, "failed to create contract config")
-
-	return oracles, offchainConfig
-}
diff --git a/core/capabilities/ccip/superfakes/token_data_reader.go b/core/capabilities/ccip/superfakes/token_data_reader.go
deleted file mode 100644
index ff6a88076c..0000000000
--- a/core/capabilities/ccip/superfakes/token_data_reader.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package superfakes
-
-import (
-	"context"
-
-	"github.com/smartcontractkit/chainlink-ccip/execute/exectypes"
-	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-)
-
-// NewNilTokenDataReader returns a new nilTokenDataReader.
-// This token data reader always returns nil for the token data.
-func NewNilTokenDataReader() exectypes.TokenDataReader {
-	return &nilTokenDataReader{}
-}
-
-type nilTokenDataReader struct{}
-
-// ReadTokenData implements exectypes.TokenDataReader.
-func (t *nilTokenDataReader) ReadTokenData(ctx context.Context, srcChain ccipocr3.ChainSelector, num ccipocr3.SeqNum) (r [][]byte, err error) {
-	return nil, nil
-}
-
-var _ exectypes.TokenDataReader = (*nilTokenDataReader)(nil)
diff --git a/core/capabilities/ccip/types/mocks/ccip_oracle.go b/core/capabilities/ccip/types/mocks/ccip_oracle.go
deleted file mode 100644
index c849b3d941..0000000000
--- a/core/capabilities/ccip/types/mocks/ccip_oracle.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Code generated by mockery v2.43.2. DO NOT EDIT.
-
-package mocks
-
-import mock "github.com/stretchr/testify/mock"
-
-// CCIPOracle is an autogenerated mock type for the CCIPOracle type
-type CCIPOracle struct {
-	mock.Mock
-}
-
-type CCIPOracle_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *CCIPOracle) EXPECT() *CCIPOracle_Expecter {
-	return &CCIPOracle_Expecter{mock: &_m.Mock}
-}
-
-// Close provides a mock function with given fields:
-func (_m *CCIPOracle) Close() error {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for Close")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func() error); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// CCIPOracle_Close_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Close'
-type CCIPOracle_Close_Call struct {
-	*mock.Call
-}
-
-// Close is a helper method to define mock.On call
-func (_e *CCIPOracle_Expecter) Close() *CCIPOracle_Close_Call {
-	return &CCIPOracle_Close_Call{Call: _e.mock.On("Close")}
-}
-
-func (_c *CCIPOracle_Close_Call) Run(run func()) *CCIPOracle_Close_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *CCIPOracle_Close_Call) Return(_a0 error) *CCIPOracle_Close_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *CCIPOracle_Close_Call) RunAndReturn(run func() error) *CCIPOracle_Close_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Start provides a mock function with given fields:
-func (_m *CCIPOracle) Start() error {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for Start")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func() error); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// CCIPOracle_Start_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Start'
-type CCIPOracle_Start_Call struct {
-	*mock.Call
-}
-
-// Start is a helper method to define mock.On call
-func (_e *CCIPOracle_Expecter) Start() *CCIPOracle_Start_Call {
-	return &CCIPOracle_Start_Call{Call: _e.mock.On("Start")}
-}
-
-func (_c *CCIPOracle_Start_Call) Run(run func()) *CCIPOracle_Start_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *CCIPOracle_Start_Call) Return(_a0 error) *CCIPOracle_Start_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *CCIPOracle_Start_Call) RunAndReturn(run func() error) *CCIPOracle_Start_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// NewCCIPOracle creates a new instance of CCIPOracle. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewCCIPOracle(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *CCIPOracle {
-	mock := &CCIPOracle{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/core/capabilities/ccip/types/mocks/home_chain_reader.go b/core/capabilities/ccip/types/mocks/home_chain_reader.go
deleted file mode 100644
index a5a581a1d2..0000000000
--- a/core/capabilities/ccip/types/mocks/home_chain_reader.go
+++ /dev/null
@@ -1,129 +0,0 @@
-package mocks
-
-import (
-	"context"
-
-	mapset "github.com/deckarep/golang-set/v2"
-	"github.com/stretchr/testify/mock"
-
-	ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-
-	"github.com/smartcontractkit/libocr/ragep2p/types"
-)
-
-var _ ccipreaderpkg.HomeChain = (*HomeChainReader)(nil)
-
-type HomeChainReader struct {
-	mock.Mock
-}
-
-func (_m *HomeChainReader) GetChainConfig(chainSelector cciptypes.ChainSelector) (ccipreaderpkg.ChainConfig, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (_m *HomeChainReader) GetAllChainConfigs() (map[cciptypes.ChainSelector]ccipreaderpkg.ChainConfig, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (_m *HomeChainReader) GetSupportedChainsForPeer(id types.PeerID) (mapset.Set[cciptypes.ChainSelector], error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (_m *HomeChainReader) GetKnownCCIPChains() (mapset.Set[cciptypes.ChainSelector], error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (_m *HomeChainReader) GetFChain() (map[cciptypes.ChainSelector]int, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (_m *HomeChainReader) Start(ctx context.Context) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (_m *HomeChainReader) Close() error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (_m *HomeChainReader) HealthReport() map[string]error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (_m *HomeChainReader) Name() string {
-	//TODO implement me
-	panic("implement me")
-}
-
-// GetOCRConfigs provides a mock function with given fields: ctx, donID, pluginType
-func (_m *HomeChainReader) GetOCRConfigs(ctx context.Context, donID uint32, pluginType uint8) ([]ccipreaderpkg.OCR3ConfigWithMeta, error) {
-	ret := _m.Called(ctx, donID, pluginType)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetOCRConfigs")
-	}
-
-	var r0 []ccipreaderpkg.OCR3ConfigWithMeta
-	var r1 error
-	if rf, ok := ret.Get(0).(func(ctx context.Context, donID uint32, pluginType uint8) ([]ccipreaderpkg.OCR3ConfigWithMeta, error)); ok {
-		return rf(ctx, donID, pluginType)
-	}
-	if rf, ok := ret.Get(0).(func(ctx context.Context, donID uint32, pluginType uint8) []ccipreaderpkg.OCR3ConfigWithMeta); ok {
-		r0 = rf(ctx, donID, pluginType)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]ccipreaderpkg.OCR3ConfigWithMeta)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(ctx context.Context, donID uint32, pluginType uint8) error); ok {
-		r1 = rf(ctx, donID, pluginType)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-func (_m *HomeChainReader) Ready() error {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for Ready")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func() error); ok {
-		return rf()
-	}
-	if rf, ok := ret.Get(0).(func() error); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// NewHomeChainReader creates a new instance of HomeChainReader. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewHomeChainReader(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *HomeChainReader {
-	mock := &HomeChainReader{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/core/capabilities/ccip/types/mocks/oracle_creator.go b/core/capabilities/ccip/types/mocks/oracle_creator.go
deleted file mode 100644
index d83ad042bf..0000000000
--- a/core/capabilities/ccip/types/mocks/oracle_creator.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Code generated by mockery v2.43.2. DO NOT EDIT.
-
-package mocks
-
-import (
-	types "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-	mock "github.com/stretchr/testify/mock"
-)
-
-// OracleCreator is an autogenerated mock type for the OracleCreator type
-type OracleCreator struct {
-	mock.Mock
-}
-
-type OracleCreator_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *OracleCreator) EXPECT() *OracleCreator_Expecter {
-	return &OracleCreator_Expecter{mock: &_m.Mock}
-}
-
-// CreateBootstrapOracle provides a mock function with given fields: config
-func (_m *OracleCreator) CreateBootstrapOracle(config types.OCR3ConfigWithMeta) (types.CCIPOracle, error) {
-	ret := _m.Called(config)
-
-	if len(ret) == 0 {
-		panic("no return value specified for CreateBootstrapOracle")
-	}
-
-	var r0 types.CCIPOracle
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.OCR3ConfigWithMeta) (types.CCIPOracle, error)); ok {
-		return rf(config)
-	}
-	if rf, ok := ret.Get(0).(func(types.OCR3ConfigWithMeta) types.CCIPOracle); ok {
-		r0 = rf(config)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(types.CCIPOracle)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.OCR3ConfigWithMeta) error); ok {
-		r1 = rf(config)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// OracleCreator_CreateBootstrapOracle_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateBootstrapOracle'
-type OracleCreator_CreateBootstrapOracle_Call struct {
-	*mock.Call
-}
-
-// CreateBootstrapOracle is a helper method to define mock.On call
-//   - config types.OCR3ConfigWithMeta
-func (_e *OracleCreator_Expecter) CreateBootstrapOracle(config interface{}) *OracleCreator_CreateBootstrapOracle_Call {
-	return &OracleCreator_CreateBootstrapOracle_Call{Call: _e.mock.On("CreateBootstrapOracle", config)}
-}
-
-func (_c *OracleCreator_CreateBootstrapOracle_Call) Run(run func(config types.OCR3ConfigWithMeta)) *OracleCreator_CreateBootstrapOracle_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.OCR3ConfigWithMeta))
-	})
-	return _c
-}
-
-func (_c *OracleCreator_CreateBootstrapOracle_Call) Return(_a0 types.CCIPOracle, _a1 error) *OracleCreator_CreateBootstrapOracle_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *OracleCreator_CreateBootstrapOracle_Call) RunAndReturn(run func(types.OCR3ConfigWithMeta) (types.CCIPOracle, error)) *OracleCreator_CreateBootstrapOracle_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// CreatePluginOracle provides a mock function with given fields: pluginType, config
-func (_m *OracleCreator) CreatePluginOracle(pluginType types.PluginType, config types.OCR3ConfigWithMeta) (types.CCIPOracle, error) {
-	ret := _m.Called(pluginType, config)
-
-	if len(ret) == 0 {
-		panic("no return value specified for CreatePluginOracle")
-	}
-
-	var r0 types.CCIPOracle
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.PluginType, types.OCR3ConfigWithMeta) (types.CCIPOracle, error)); ok {
-		return rf(pluginType, config)
-	}
-	if rf, ok := ret.Get(0).(func(types.PluginType, types.OCR3ConfigWithMeta) types.CCIPOracle); ok {
-		r0 = rf(pluginType, config)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(types.CCIPOracle)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.PluginType, types.OCR3ConfigWithMeta) error); ok {
-		r1 = rf(pluginType, config)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// OracleCreator_CreatePluginOracle_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreatePluginOracle'
-type OracleCreator_CreatePluginOracle_Call struct {
-	*mock.Call
-}
-
-// CreatePluginOracle is a helper method to define mock.On call
-//   - pluginType types.PluginType
-//   - config types.OCR3ConfigWithMeta
-func (_e *OracleCreator_Expecter) CreatePluginOracle(pluginType interface{}, config interface{}) *OracleCreator_CreatePluginOracle_Call {
-	return &OracleCreator_CreatePluginOracle_Call{Call: _e.mock.On("CreatePluginOracle", pluginType, config)}
-}
-
-func (_c *OracleCreator_CreatePluginOracle_Call) Run(run func(pluginType types.PluginType, config types.OCR3ConfigWithMeta)) *OracleCreator_CreatePluginOracle_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.PluginType), args[1].(types.OCR3ConfigWithMeta))
-	})
-	return _c
-}
-
-func (_c *OracleCreator_CreatePluginOracle_Call) Return(_a0 types.CCIPOracle, _a1 error) *OracleCreator_CreatePluginOracle_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *OracleCreator_CreatePluginOracle_Call) RunAndReturn(run func(types.PluginType, types.OCR3ConfigWithMeta) (types.CCIPOracle, error)) *OracleCreator_CreatePluginOracle_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// NewOracleCreator creates a new instance of OracleCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewOracleCreator(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *OracleCreator {
-	mock := &OracleCreator{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/core/capabilities/ccip/types/types.go b/core/capabilities/ccip/types/types.go
deleted file mode 100644
index 952b8fe446..0000000000
--- a/core/capabilities/ccip/types/types.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package types
-
-import (
-	ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-)
-
-// OCR3ConfigWithMeta is a type alias in order to generate correct mocks for the OracleCreator interface.
-type OCR3ConfigWithMeta ccipreaderpkg.OCR3ConfigWithMeta
-
-// PluginType represents the type of CCIP plugin.
-// It mirrors the OCRPluginType in Internal.sol.
-type PluginType uint8
-
-const (
-	PluginTypeCCIPCommit PluginType = 0
-	PluginTypeCCIPExec   PluginType = 1
-)
-
-func (pt PluginType) String() string {
-	switch pt {
-	case PluginTypeCCIPCommit:
-		return "CCIPCommit"
-	case PluginTypeCCIPExec:
-		return "CCIPExec"
-	default:
-		return "Unknown"
-	}
-}
-
-// CCIPOracle represents either a CCIP commit or exec oracle or a bootstrap node.
-type CCIPOracle interface {
-	Close() error
-	Start() error
-}
-
-// OracleCreator is an interface for creating CCIP oracles.
-// Whether the oracle uses a LOOPP or not is an implementation detail.
-type OracleCreator interface {
-	// CreatePlugin creates a new oracle that will run either the commit or exec ccip plugin.
-	// The oracle must be returned unstarted.
-	CreatePluginOracle(pluginType PluginType, config OCR3ConfigWithMeta) (CCIPOracle, error)
-
-	// CreateBootstrapOracle creates a new bootstrap node with the given OCR config.
-	// The oracle must be returned unstarted.
-	CreateBootstrapOracle(config OCR3ConfigWithMeta) (CCIPOracle, error)
-}
diff --git a/core/capabilities/ccip/validate/validate.go b/core/capabilities/ccip/validate/validate.go
deleted file mode 100644
index 04f4f4a495..0000000000
--- a/core/capabilities/ccip/validate/validate.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package validate
-
-import (
-	"fmt"
-
-	"github.com/google/uuid"
-	"github.com/pelletier/go-toml"
-
-	"github.com/smartcontractkit/chainlink/v2/core/services/job"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
-)
-
-// ValidatedCCIPSpec validates the given toml string as a CCIP spec.
-func ValidatedCCIPSpec(tomlString string) (jb job.Job, err error) {
-	var spec job.CCIPSpec
-	tree, err := toml.Load(tomlString)
-	if err != nil {
-		return job.Job{}, fmt.Errorf("toml error on load: %w", err)
-	}
-	// Note this validates all the fields which implement an UnmarshalText
-	err = tree.Unmarshal(&spec)
-	if err != nil {
-		return job.Job{}, fmt.Errorf("toml unmarshal error on spec: %w", err)
-	}
-	err = tree.Unmarshal(&jb)
-	if err != nil {
-		return job.Job{}, fmt.Errorf("toml unmarshal error on job: %w", err)
-	}
-	jb.CCIPSpec = &spec
-
-	if jb.Type != job.CCIP {
-		return job.Job{}, fmt.Errorf("the only supported type is currently 'ccip', got %s", jb.Type)
-	}
-	if jb.CCIPSpec.CapabilityLabelledName == "" {
-		return job.Job{}, fmt.Errorf("capabilityLabelledName must be set")
-	}
-	if jb.CCIPSpec.CapabilityVersion == "" {
-		return job.Job{}, fmt.Errorf("capabilityVersion must be set")
-	}
-	if jb.CCIPSpec.P2PKeyID == "" {
-		return job.Job{}, fmt.Errorf("p2pKeyID must be set")
-	}
-	if len(jb.CCIPSpec.P2PV2Bootstrappers) == 0 {
-		return job.Job{}, fmt.Errorf("p2pV2Bootstrappers must be set")
-	}
-
-	// ensure that the P2PV2Bootstrappers is in the right format.
-	for _, bootstrapperLocator := range jb.CCIPSpec.P2PV2Bootstrappers {
-		// needs to be of the form <peer_id>@<ip-address>:<port>
-		_, err := ocrcommon.ParseBootstrapPeers([]string{bootstrapperLocator})
-		if err != nil {
-			return job.Job{}, fmt.Errorf("p2p v2 bootstrapper locator %s is not in the correct format: %w", bootstrapperLocator, err)
-		}
-	}
-
-	return jb, nil
-}
-
-type SpecArgs struct {
-	P2PV2Bootstrappers     []string          `toml:"p2pV2Bootstrappers"`
-	CapabilityVersion      string            `toml:"capabilityVersion"`
-	CapabilityLabelledName string            `toml:"capabilityLabelledName"`
-	OCRKeyBundleIDs        map[string]string `toml:"ocrKeyBundleIDs"`
-	P2PKeyID               string            `toml:"p2pKeyID"`
-	RelayConfigs           map[string]any    `toml:"relayConfigs"`
-	PluginConfig           map[string]any    `toml:"pluginConfig"`
-}
-
-// NewCCIPSpecToml creates a new CCIP spec in toml format from the given spec args.
-func NewCCIPSpecToml(spec SpecArgs) (string, error) {
-	type fullSpec struct {
-		SpecArgs
-		Type          string `toml:"type"`
-		SchemaVersion uint64 `toml:"schemaVersion"`
-		Name          string `toml:"name"`
-		ExternalJobID string `toml:"externalJobID"`
-	}
-	extJobID, err := uuid.NewRandom()
-	if err != nil {
-		return "", fmt.Errorf("failed to generate external job id: %w", err)
-	}
-	marshaled, err := toml.Marshal(fullSpec{
-		SpecArgs:      spec,
-		Type:          "ccip",
-		SchemaVersion: 1,
-		Name:          fmt.Sprintf("%s-%s", "ccip", extJobID.String()),
-		ExternalJobID: extJobID.String(),
-	})
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal spec into toml: %w", err)
-	}
-
-	return string(marshaled), nil
-}
diff --git a/core/capabilities/ccip/validate/validate_test.go b/core/capabilities/ccip/validate/validate_test.go
deleted file mode 100644
index 97958f4cf9..0000000000
--- a/core/capabilities/ccip/validate/validate_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package validate_test
-
-import (
-	"testing"
-
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/validate"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/chainlink/v2/core/services/job"
-)
-
-func TestNewCCIPSpecToml(t *testing.T) {
-	tests := []struct {
-		name     string
-		specArgs validate.SpecArgs
-		want     string
-		wantErr  bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := validate.NewCCIPSpecToml(tt.specArgs)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-				require.Equal(t, tt.want, got)
-			}
-		})
-	}
-}
-
-func TestValidatedCCIPSpec(t *testing.T) {
-	type args struct {
-		tomlString string
-	}
-	tests := []struct {
-		name    string
-		args    args
-		wantJb  job.Job
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotJb, err := validate.ValidatedCCIPSpec(tt.args.tomlString)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-				require.Equal(t, tt.wantJb, gotJb)
-			}
-		})
-	}
-}
diff --git a/core/chains/evm/client/errors.go b/core/chains/evm/client/errors.go
index e7fff8d0db..5980b0dd96 100644
--- a/core/chains/evm/client/errors.go
+++ b/core/chains/evm/client/errors.go
@@ -161,6 +161,12 @@ var arbitrum = ClientErrors{
 	ServiceUnavailable:    regexp.MustCompile(`(: |^)502 Bad Gateway: [\s\S]*$|network is unreachable|i/o timeout`),
 }
 
+// Treasure
+var treasureFatal = regexp.MustCompile(`(: |^)invalid chain id for signer(:|$)`)
+var treasure = ClientErrors{
+	Fatal: treasureFatal,
+}
+
 var celo = ClientErrors{
 	TxFeeExceedsCap:       regexp.MustCompile(`(: |^)tx fee \([0-9\.]+ of currency celo\) exceeds the configured cap \([0-9\.]+ [a-zA-Z]+\)$`),
 	TerminallyUnderpriced: regexp.MustCompile(`(: |^)gasprice is less than gas price minimum floor`),
@@ -270,7 +276,7 @@ var internal = ClientErrors{
 	TerminallyStuck: regexp.MustCompile(TerminallyStuckMsg),
 }
 
-var clients = []ClientErrors{parity, geth, arbitrum, metis, substrate, avalanche, nethermind, harmony, besu, erigon, klaytn, celo, zkSync, zkEvm, mantle, aStar, gnosis, internal}
+var clients = []ClientErrors{parity, geth, arbitrum, metis, substrate, avalanche, nethermind, harmony, besu, erigon, klaytn, celo, zkSync, zkEvm, treasure, mantle, aStar, gnosis, internal}
 
 // ClientErrorRegexes returns a map of compiled regexes for each error type
 func ClientErrorRegexes(errsRegex config.ClientErrors) *ClientErrors {
diff --git a/core/chains/evm/client/errors_test.go b/core/chains/evm/client/errors_test.go
index bddc7dd3db..47e8ee610b 100644
--- a/core/chains/evm/client/errors_test.go
+++ b/core/chains/evm/client/errors_test.go
@@ -401,6 +401,7 @@ func Test_Eth_Errors_Fatal(t *testing.T) {
 		{"Failed to serialize transaction: oversized data. max: 1000000; actual: 1000000", true, "zkSync"},
 
 		{"client error fatal", true, "tomlConfig"},
+		{"invalid chain id for signer", true, "Treasure"},
 	}
 
 	for _, test := range tests {
diff --git a/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml b/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
index 2d356d9564..87808001eb 100644
--- a/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
@@ -1,6 +1,5 @@
 ChainID = '592'
-# FinalityTag will be enabled once the custom tag is implemented
-# FinalityTagEnabled = true
+FinalityTagEnabled = true
 FinalityDepth = 100
 LogPollInterval = '6s'
 
diff --git a/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
index 36f42b7f02..5a5df06f6f 100644
--- a/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
+++ b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
@@ -1,6 +1,5 @@
 ChainID = '81'
-# FinalityTag will be enabled once the custom tag is implemented
-# FinalityTagEnabled = true
+FinalityTagEnabled = true
 FinalityDepth = 100
 LogPollInterval = '6s'
 
diff --git a/core/chains/evm/config/toml/defaults/Metis_Sepolia.toml b/core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
index 286b888e1a..4ff4056c75 100644
--- a/core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
@@ -1,5 +1,5 @@
 ChainID = '59902'
-ChainType = 'metis'
+ChainType = 'optimismBedrock'
 FinalityDepth = 10
 FinalityTagEnabled = true
 MinIncomingConfirmations = 1
diff --git a/core/gethwrappers/ccip/generated/ccip_reader_tester/ccip_reader_tester.go b/core/gethwrappers/ccip/generated/ccip_reader_tester/ccip_reader_tester.go
index 164c066e23..cce56e0d80 100644
--- a/core/gethwrappers/ccip/generated/ccip_reader_tester/ccip_reader_tester.go
+++ b/core/gethwrappers/ccip/generated/ccip_reader_tester/ccip_reader_tester.go
@@ -64,6 +64,7 @@ type InternalRampTokenAmount struct {
 	DestTokenAddress  []byte
 	ExtraData         []byte
 	Amount            *big.Int
+	DestExecData      []byte
 }
 
 type InternalTokenPriceUpdate struct {
@@ -95,8 +96,8 @@ type OffRampSourceChainConfig struct {
 }
 
 var CCIPReaderTesterMetaData = &bind.MetaData{
-	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"receiver\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraArgs\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"indexed\":false,\"internalType\":\"structInternal.EVM2AnyRampMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"CCIPSendRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"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\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.MerkleRoot[]\",\"name\":\"merkleRoots\",\"type\":\"tuple[]\"}],\"indexed\":false,\"internalType\":\"structOffRamp.CommitReport\",\"name\":\"report\",\"type\":\"tuple\"}],\"name\":\"CommitReportAccepted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"enumInternal.MessageExecutionState\",\"name\":\"state\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"returnData\",\"type\":\"bytes\"}],\"name\":\"ExecutionStateChanged\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"receiver\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraArgs\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.EVM2AnyRampMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"emitCCIPSendRequested\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"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\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.MerkleRoot[]\",\"name\":\"merkleRoots\",\"type\":\"tuple[]\"}],\"internalType\":\"structOffRamp.CommitReport\",\"name\":\"report\",\"type\":\"tuple\"}],\"name\":\"emitCommitReportAccepted\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"enumInternal.MessageExecutionState\",\"name\":\"state\",\"type\":\"uint8\"},{\"internalType\":\"bytes\",\"name\":\"returnData\",\"type\":\"bytes\"}],\"name\":\"emitExecutionStateChanged\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"getSourceChainConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint64\",\"name\":\"minSeqNr\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"internalType\":\"structOffRamp.SourceChainConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint64\",\"name\":\"minSeqNr\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"internalType\":\"structOffRamp.SourceChainConfig\",\"name\":\"sourceChainConfig\",\"type\":\"tuple\"}],\"name\":\"setSourceChainConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
-	Bin: "0x608060405234801561001057600080fd5b50611149806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80634cf66e361461005c578063a65558f614610071578063e44302b714610084578063e83eabba14610097578063e9d68a8e146100aa575b600080fd5b61006f61006a3660046104a7565b6100d3565b005b61006f61007f366004610718565b610128565b61006f6100923660046109b6565b61016d565b61006f6100a5366004610b20565b6101a7565b6100bd6100b8366004610bdb565b610233565b6040516100ca9190610c43565b60405180910390f35b82846001600160401b0316866001600160401b03167f8c324ce1367b83031769f6a813e3bb4c117aba2185789d66b98b791405be6df28585604051610119929190610c9b565b60405180910390a45050505050565b816001600160401b03167f0f07cd31e53232da9125e517f09550fdde74bf43d6a0a76ebd41674dafe2ab29826040516101619190610d83565b60405180910390a25050565b7f3a3950e13dd607cc37980db0ef14266c40d2bba9c01b2e44bfe549808883095d8160405161019c9190610f3d565b60405180910390a150565b6001600160401b0380831660009081526020818152604091829020845181549286015193860151909416600160a81b02600160a81b600160e81b0319931515600160a01b026001600160a81b03199093166001600160a01b039095169490941791909117919091169190911781556060820151829190600182019061022c908261107d565b5050505050565b60408051608080820183526000808352602080840182905283850182905260608085018190526001600160401b038781168452838352928690208651948501875280546001600160a01b0381168652600160a01b810460ff16151593860193909352600160a81b9092049092169483019490945260018401805493949293918401916102be90610ff2565b80601f01602080910402602001604051908101604052809291908181526020018280546102ea90610ff2565b80156103375780601f1061030c57610100808354040283529160200191610337565b820191906000526020600020905b81548152906001019060200180831161031a57829003601f168201915b5050505050815250509050919050565b80356001600160401b038116811461035e57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b038111828210171561039b5761039b610363565b60405290565b60405161010081016001600160401b038111828210171561039b5761039b610363565b604080519081016001600160401b038111828210171561039b5761039b610363565b604051606081016001600160401b038111828210171561039b5761039b610363565b604051601f8201601f191681016001600160401b038111828210171561043057610430610363565b604052919050565b600082601f83011261044957600080fd5b81356001600160401b0381111561046257610462610363565b610475601f8201601f1916602001610408565b81815284602083860101111561048a57600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600060a086880312156104bf57600080fd5b6104c886610347565b94506104d660208701610347565b9350604086013592506060860135600481106104f157600080fd5b915060808601356001600160401b0381111561050c57600080fd5b61051888828901610438565b9150509295509295909350565b600060a0828403121561053757600080fd5b60405160a081016001600160401b038111828210171561055957610559610363565b6040528235815290508061056f60208401610347565b602082015261058060408401610347565b604082015261059160608401610347565b60608201526105a260808401610347565b60808201525092915050565b6001600160a01b03811681146105c357600080fd5b50565b803561035e816105ae565b60006001600160401b038211156105ea576105ea610363565b5060051b60200190565b600082601f83011261060557600080fd5b8135602061061a610615836105d1565b610408565b82815260059290921b8401810191818101908684111561063957600080fd5b8286015b8481101561070d5780356001600160401b038082111561065d5760008081fd5b908801906080828b03601f19018113156106775760008081fd5b61067f610379565b87840135838111156106915760008081fd5b61069f8d8a83880101610438565b825250604080850135848111156106b65760008081fd5b6106c48e8b83890101610438565b8a84015250606080860135858111156106dd5760008081fd5b6106eb8f8c838a0101610438565b928401929092529490920135938101939093525050835291830191830161063d565b509695505050505050565b6000806040838503121561072b57600080fd5b61073483610347565b915060208301356001600160401b038082111561075057600080fd5b90840190610180828703121561076557600080fd5b61076d6103a1565b6107778784610525565b815261078560a084016105c6565b602082015260c08301358281111561079c57600080fd5b6107a888828601610438565b60408301525060e0830135828111156107c057600080fd5b6107cc88828601610438565b606083015250610100830135828111156107e557600080fd5b6107f188828601610438565b60808301525061080461012084016105c6565b60a082015261014083013560c08201526101608301358281111561082757600080fd5b610833888286016105f4565b60e0830152508093505050509250929050565b80356001600160e01b038116811461035e57600080fd5b600082601f83011261086e57600080fd5b8135602061087e610615836105d1565b82815260069290921b8401810191818101908684111561089d57600080fd5b8286015b8481101561070d57604081890312156108ba5760008081fd5b6108c26103c4565b6108cb82610347565b81526108d8858301610846565b818601528352918301916040016108a1565b600082601f8301126108fb57600080fd5b8135602061090b610615836105d1565b82815260079290921b8401810191818101908684111561092a57600080fd5b8286015b8481101561070d5780880360808112156109485760008081fd5b6109506103e6565b61095983610347565b8152604080601f198401121561096f5760008081fd5b6109776103c4565b9250610984878501610347565b8352610991818501610347565b838801528187019290925260608301359181019190915283529183019160800161092e565b600060208083850312156109c957600080fd5b82356001600160401b03808211156109e057600080fd5b818501915060408083880312156109f657600080fd5b6109fe6103c4565b833583811115610a0d57600080fd5b84016040818a031215610a1f57600080fd5b610a276103c4565b813585811115610a3657600080fd5b8201601f81018b13610a4757600080fd5b8035610a55610615826105d1565b81815260069190911b8201890190898101908d831115610a7457600080fd5b928a01925b82841015610ac45787848f031215610a915760008081fd5b610a996103c4565b8435610aa4816105ae565b8152610ab1858d01610846565b818d0152825292870192908a0190610a79565b845250505081870135935084841115610adc57600080fd5b610ae88a85840161085d565b8188015282525083850135915082821115610b0257600080fd5b610b0e888386016108ea565b85820152809550505050505092915050565b60008060408385031215610b3357600080fd5b610b3c83610347565b915060208301356001600160401b0380821115610b5857600080fd5b9084019060808287031215610b6c57600080fd5b610b74610379565b8235610b7f816105ae565b815260208301358015158114610b9457600080fd5b6020820152610ba560408401610347565b6040820152606083013582811115610bbc57600080fd5b610bc888828601610438565b6060830152508093505050509250929050565b600060208284031215610bed57600080fd5b610bf682610347565b9392505050565b6000815180845260005b81811015610c2357602081850181015186830182015201610c07565b506000602082860101526020601f19601f83011685010191505092915050565b602080825282516001600160a01b03168282015282015115156040808301919091528201516001600160401b0316606080830191909152820151608080830152600090610c9360a0840182610bfd565b949350505050565b600060048410610cbb57634e487b7160e01b600052602160045260246000fd5b83825260406020830152610c936040830184610bfd565b6001600160a01b03169052565b600082825180855260208086019550808260051b84010181860160005b84811015610d7657601f19868403018952815160808151818652610d2282870182610bfd565b9150508582015185820387870152610d3a8282610bfd565b91505060408083015186830382880152610d548382610bfd565b6060948501519790940196909652505098840198925090830190600101610cfc565b5090979650505050505050565b60208152610dd0602082018351805182526020808201516001600160401b039081169184019190915260408083015182169084015260608083015182169084015260809182015116910152565b60006020830151610de460c0840182610cd2565b5060408301516101808060e0850152610e016101a0850183610bfd565b91506060850151601f198086850301610100870152610e208483610bfd565b9350608087015191508086850301610120870152610e3e8483610bfd565b935060a08701519150610e55610140870183610cd2565b60c087015161016087015260e0870151915080868503018387015250610e7b8382610cdf565b9695505050505050565b60008151808452602080850194506020840160005b83811015610ed357815180516001600160401b031688528301516001600160e01b03168388015260409096019590820190600101610e9a565b509495945050505050565b600081518084526020808501945080840160005b83811015610ed357815180516001600160401b0390811689528482015180518216868b0152850151166040898101919091520151606088015260809096019590820190600101610ef2565b6000602080835283516040808386015260a0850182516040606088015281815180845260c0890191508683019350600092505b80831015610fab57835180516001600160a01b031683528701516001600160e01b031687830152928601926001929092019190840190610f70565b5093850151878503605f1901608089015293610fc78186610e85565b945050505050818501519150601f19848203016040850152610fe98183610ede565b95945050505050565b600181811c9082168061100657607f821691505b60208210810361102657634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115611078576000816000526020600020601f850160051c810160208610156110555750805b601f850160051c820191505b8181101561107457828155600101611061565b5050505b505050565b81516001600160401b0381111561109657611096610363565b6110aa816110a48454610ff2565b8461102c565b602080601f8311600181146110df57600084156110c75750858301515b600019600386901b1c1916600185901b178555611074565b600085815260208120601f198616915b8281101561110e578886015182559484019460019091019084016110ef565b508582101561112c5787850151600019600388901b60f8161c191681555b5050505050600190811b0190555056fea164736f6c6343000818000a",
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"receiver\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraArgs\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"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.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"indexed\":false,\"internalType\":\"structInternal.EVM2AnyRampMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"CCIPSendRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"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\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.MerkleRoot[]\",\"name\":\"merkleRoots\",\"type\":\"tuple[]\"}],\"indexed\":false,\"internalType\":\"structOffRamp.CommitReport\",\"name\":\"report\",\"type\":\"tuple\"}],\"name\":\"CommitReportAccepted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"enumInternal.MessageExecutionState\",\"name\":\"state\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"returnData\",\"type\":\"bytes\"}],\"name\":\"ExecutionStateChanged\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"receiver\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraArgs\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"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.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.EVM2AnyRampMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"emitCCIPSendRequested\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"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\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.MerkleRoot[]\",\"name\":\"merkleRoots\",\"type\":\"tuple[]\"}],\"internalType\":\"structOffRamp.CommitReport\",\"name\":\"report\",\"type\":\"tuple\"}],\"name\":\"emitCommitReportAccepted\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"enumInternal.MessageExecutionState\",\"name\":\"state\",\"type\":\"uint8\"},{\"internalType\":\"bytes\",\"name\":\"returnData\",\"type\":\"bytes\"}],\"name\":\"emitExecutionStateChanged\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getExpectedNextSequenceNumber\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"getSourceChainConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint64\",\"name\":\"minSeqNr\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"internalType\":\"structOffRamp.SourceChainConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"setDestChainSeqNr\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint64\",\"name\":\"minSeqNr\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"internalType\":\"structOffRamp.SourceChainConfig\",\"name\":\"sourceChainConfig\",\"type\":\"tuple\"}],\"name\":\"setSourceChainConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	Bin: "0x608060405234801561001057600080fd5b5061129d806100206000396000f3fe608060405234801561001057600080fd5b506004361061006d5760003560e01c80634cf66e361461007257806385096da9146100875780639041be3d1461009a578063c1a5a355146100ca578063e44302b714610106578063e83eabba14610119578063e9d68a8e1461012c575b600080fd5b610085610080366004610571565b61014c565b005b6100856100953660046107e9565b6101a1565b6100ad6100a8366004610917565b6101e6565b6040516001600160401b0390911681526020015b60405180910390f35b6100856100d8366004610939565b6001600160401b03918216600090815260016020526040902080546001600160401b03191691909216179055565b610085610114366004610adc565b610215565b610085610127366004610c46565b61024f565b61013f61013a366004610917565b6102db565b6040516100c19190610d47565b82846001600160401b0316866001600160401b03167f8c324ce1367b83031769f6a813e3bb4c117aba2185789d66b98b791405be6df28585604051610192929190610d9f565b60405180910390a45050505050565b816001600160401b03167fcae3d9f68a9ed33d0a770e9bcc6fc25d4041dd6391e6cd8015546547a3c93140826040516101da9190610ea2565b60405180910390a25050565b6001600160401b038082166000908152600160208190526040822054919261020f921690610fa4565b92915050565b7f3a3950e13dd607cc37980db0ef14266c40d2bba9c01b2e44bfe549808883095d816040516102449190611091565b60405180910390a150565b6001600160401b0380831660009081526020818152604091829020845181549286015193860151909416600160a81b02600160a81b600160e81b0319931515600160a01b026001600160a81b03199093166001600160a01b03909516949094179190911791909116919091178155606082015182919060018201906102d490826111d1565b5050505050565b60408051608080820183526000808352602080840182905283850182905260608085018190526001600160401b038781168452838352928690208651948501875280546001600160a01b0381168652600160a01b810460ff16151593860193909352600160a81b90920490921694830194909452600184018054939492939184019161036690611146565b80601f016020809104026020016040519081016040528092919081815260200182805461039290611146565b80156103df5780601f106103b4576101008083540402835291602001916103df565b820191906000526020600020905b8154815290600101906020018083116103c257829003601f168201915b5050505050815250509050919050565b80356001600160401b038116811461040657600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60405160a081016001600160401b03811182821017156104435761044361040b565b60405290565b60405161010081016001600160401b03811182821017156104435761044361040b565b604080519081016001600160401b03811182821017156104435761044361040b565b604051606081016001600160401b03811182821017156104435761044361040b565b604051608081016001600160401b03811182821017156104435761044361040b565b604051601f8201601f191681016001600160401b03811182821017156104fa576104fa61040b565b604052919050565b600082601f83011261051357600080fd5b81356001600160401b0381111561052c5761052c61040b565b61053f601f8201601f19166020016104d2565b81815284602083860101111561055457600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600060a0868803121561058957600080fd5b610592866103ef565b94506105a0602087016103ef565b9350604086013592506060860135600481106105bb57600080fd5b915060808601356001600160401b038111156105d657600080fd5b6105e288828901610502565b9150509295509295909350565b600060a0828403121561060157600080fd5b610609610421565b90508135815261061b602083016103ef565b602082015261062c604083016103ef565b604082015261063d606083016103ef565b606082015261064e608083016103ef565b608082015292915050565b6001600160a01b038116811461066e57600080fd5b50565b803561040681610659565b60006001600160401b038211156106955761069561040b565b5060051b60200190565b600082601f8301126106b057600080fd5b813560206106c56106c08361067c565b6104d2565b82815260059290921b840181019181810190868411156106e457600080fd5b8286015b848110156107de5780356001600160401b03808211156107085760008081fd5b9088019060a0828b03601f19018113156107225760008081fd5b61072a610421565b878401358381111561073c5760008081fd5b61074a8d8a83880101610502565b825250604080850135848111156107615760008081fd5b61076f8e8b83890101610502565b8a84015250606080860135858111156107885760008081fd5b6107968f8c838a0101610502565b838501525060809150818601358184015250828501359250838311156107bc5760008081fd5b6107ca8d8a85880101610502565b9082015286525050509183019183016106e8565b509695505050505050565b600080604083850312156107fc57600080fd5b610805836103ef565b915060208301356001600160401b038082111561082157600080fd5b90840190610180828703121561083657600080fd5b61083e610449565b61084887846105ef565b815261085660a08401610671565b602082015260c08301358281111561086d57600080fd5b61087988828601610502565b60408301525060e08301358281111561089157600080fd5b61089d88828601610502565b606083015250610100830135828111156108b657600080fd5b6108c288828601610502565b6080830152506108d56101208401610671565b60a082015261014083013560c0820152610160830135828111156108f857600080fd5b6109048882860161069f565b60e0830152508093505050509250929050565b60006020828403121561092957600080fd5b610932826103ef565b9392505050565b6000806040838503121561094c57600080fd5b610955836103ef565b9150610963602084016103ef565b90509250929050565b80356001600160e01b038116811461040657600080fd5b600082601f83011261099457600080fd5b813560206109a46106c08361067c565b82815260069290921b840181019181810190868411156109c357600080fd5b8286015b848110156107de57604081890312156109e05760008081fd5b6109e861046c565b6109f1826103ef565b81526109fe85830161096c565b818601528352918301916040016109c7565b600082601f830112610a2157600080fd5b81356020610a316106c08361067c565b82815260079290921b84018101918181019086841115610a5057600080fd5b8286015b848110156107de578088036080811215610a6e5760008081fd5b610a7661048e565b610a7f836103ef565b8152604080601f1984011215610a955760008081fd5b610a9d61046c565b9250610aaa8785016103ef565b8352610ab78185016103ef565b8388015281870192909252606083013591810191909152835291830191608001610a54565b60006020808385031215610aef57600080fd5b82356001600160401b0380821115610b0657600080fd5b81850191506040808388031215610b1c57600080fd5b610b2461046c565b833583811115610b3357600080fd5b84016040818a031215610b4557600080fd5b610b4d61046c565b813585811115610b5c57600080fd5b8201601f81018b13610b6d57600080fd5b8035610b7b6106c08261067c565b81815260069190911b8201890190898101908d831115610b9a57600080fd5b928a01925b82841015610bea5787848f031215610bb75760008081fd5b610bbf61046c565b8435610bca81610659565b8152610bd7858d0161096c565b818d0152825292870192908a0190610b9f565b845250505081870135935084841115610c0257600080fd5b610c0e8a858401610983565b8188015282525083850135915082821115610c2857600080fd5b610c3488838601610a10565b85820152809550505050505092915050565b60008060408385031215610c5957600080fd5b610c62836103ef565b915060208301356001600160401b0380821115610c7e57600080fd5b9084019060808287031215610c9257600080fd5b610c9a6104b0565b8235610ca581610659565b815260208301358015158114610cba57600080fd5b6020820152610ccb604084016103ef565b6040820152606083013582811115610ce257600080fd5b610cee88828601610502565b6060830152508093505050509250929050565b6000815180845260005b81811015610d2757602081850181015186830182015201610d0b565b506000602082860101526020601f19601f83011685010191505092915050565b602080825282516001600160a01b03168282015282015115156040808301919091528201516001600160401b0316606080830191909152820151608080830152600090610d9760a0840182610d01565b949350505050565b600060048410610dbf57634e487b7160e01b600052602160045260246000fd5b83825260406020830152610d976040830184610d01565b6001600160a01b03169052565b600082825180855260208086019550808260051b84010181860160005b84811015610e9557601f19868403018952815160a08151818652610e2682870182610d01565b9150508582015185820387870152610e3e8282610d01565b91505060408083015186830382880152610e588382610d01565b92505050606080830151818701525060808083015192508582038187015250610e818183610d01565b9a86019a9450505090830190600101610e00565b5090979650505050505050565b60208152610eef602082018351805182526020808201516001600160401b039081169184019190915260408083015182169084015260608083015182169084015260809182015116910152565b60006020830151610f0360c0840182610dd6565b5060408301516101808060e0850152610f206101a0850183610d01565b91506060850151601f198086850301610100870152610f3f8483610d01565b9350608087015191508086850301610120870152610f5d8483610d01565b935060a08701519150610f74610140870183610dd6565b60c087015161016087015260e0870151915080868503018387015250610f9a8382610de3565b9695505050505050565b6001600160401b03818116838216019080821115610fd257634e487b7160e01b600052601160045260246000fd5b5092915050565b60008151808452602080850194506020840160005b8381101561102757815180516001600160401b031688528301516001600160e01b03168388015260409096019590820190600101610fee565b509495945050505050565b600081518084526020808501945080840160005b8381101561102757815180516001600160401b0390811689528482015180518216868b0152850151166040898101919091520151606088015260809096019590820190600101611046565b6000602080835283516040808386015260a0850182516040606088015281815180845260c0890191508683019350600092505b808310156110ff57835180516001600160a01b031683528701516001600160e01b0316878301529286019260019290920191908401906110c4565b5093850151878503605f190160808901529361111b8186610fd9565b945050505050818501519150601f1984820301604085015261113d8183611032565b95945050505050565b600181811c9082168061115a57607f821691505b60208210810361117a57634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156111cc576000816000526020600020601f850160051c810160208610156111a95750805b601f850160051c820191505b818110156111c8578281556001016111b5565b5050505b505050565b81516001600160401b038111156111ea576111ea61040b565b6111fe816111f88454611146565b84611180565b602080601f831160018114611233576000841561121b5750858301515b600019600386901b1c1916600185901b1785556111c8565b600085815260208120601f198616915b8281101561126257888601518255948401946001909101908401611243565b50858210156112805787850151600019600388901b60f8161c191681555b5050505050600190811b0190555056fea164736f6c6343000818000a",
 }
 
 var CCIPReaderTesterABI = CCIPReaderTesterMetaData.ABI
@@ -235,6 +236,28 @@ func (_CCIPReaderTester *CCIPReaderTesterTransactorRaw) Transact(opts *bind.Tran
 	return _CCIPReaderTester.Contract.contract.Transact(opts, method, params...)
 }
 
+func (_CCIPReaderTester *CCIPReaderTesterCaller) GetExpectedNextSequenceNumber(opts *bind.CallOpts, destChainSelector uint64) (uint64, error) {
+	var out []interface{}
+	err := _CCIPReaderTester.contract.Call(opts, &out, "getExpectedNextSequenceNumber", destChainSelector)
+
+	if err != nil {
+		return *new(uint64), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64)
+
+	return out0, err
+
+}
+
+func (_CCIPReaderTester *CCIPReaderTesterSession) GetExpectedNextSequenceNumber(destChainSelector uint64) (uint64, error) {
+	return _CCIPReaderTester.Contract.GetExpectedNextSequenceNumber(&_CCIPReaderTester.CallOpts, destChainSelector)
+}
+
+func (_CCIPReaderTester *CCIPReaderTesterCallerSession) GetExpectedNextSequenceNumber(destChainSelector uint64) (uint64, error) {
+	return _CCIPReaderTester.Contract.GetExpectedNextSequenceNumber(&_CCIPReaderTester.CallOpts, destChainSelector)
+}
+
 func (_CCIPReaderTester *CCIPReaderTesterCaller) GetSourceChainConfig(opts *bind.CallOpts, sourceChainSelector uint64) (OffRampSourceChainConfig, error) {
 	var out []interface{}
 	err := _CCIPReaderTester.contract.Call(opts, &out, "getSourceChainConfig", sourceChainSelector)
@@ -293,6 +316,18 @@ func (_CCIPReaderTester *CCIPReaderTesterTransactorSession) EmitExecutionStateCh
 	return _CCIPReaderTester.Contract.EmitExecutionStateChanged(&_CCIPReaderTester.TransactOpts, sourceChainSelector, sequenceNumber, messageId, state, returnData)
 }
 
+func (_CCIPReaderTester *CCIPReaderTesterTransactor) SetDestChainSeqNr(opts *bind.TransactOpts, destChainSelector uint64, sequenceNumber uint64) (*types.Transaction, error) {
+	return _CCIPReaderTester.contract.Transact(opts, "setDestChainSeqNr", destChainSelector, sequenceNumber)
+}
+
+func (_CCIPReaderTester *CCIPReaderTesterSession) SetDestChainSeqNr(destChainSelector uint64, sequenceNumber uint64) (*types.Transaction, error) {
+	return _CCIPReaderTester.Contract.SetDestChainSeqNr(&_CCIPReaderTester.TransactOpts, destChainSelector, sequenceNumber)
+}
+
+func (_CCIPReaderTester *CCIPReaderTesterTransactorSession) SetDestChainSeqNr(destChainSelector uint64, sequenceNumber uint64) (*types.Transaction, error) {
+	return _CCIPReaderTester.Contract.SetDestChainSeqNr(&_CCIPReaderTester.TransactOpts, destChainSelector, sequenceNumber)
+}
+
 func (_CCIPReaderTester *CCIPReaderTesterTransactor) SetSourceChainConfig(opts *bind.TransactOpts, sourceChainSelector uint64, sourceChainConfig OffRampSourceChainConfig) (*types.Transaction, error) {
 	return _CCIPReaderTester.contract.Transact(opts, "setSourceChainConfig", sourceChainSelector, sourceChainConfig)
 }
@@ -712,7 +747,7 @@ func (_CCIPReaderTester *CCIPReaderTester) ParseLog(log types.Log) (generated.Ab
 }
 
 func (CCIPReaderTesterCCIPSendRequested) Topic() common.Hash {
-	return common.HexToHash("0x0f07cd31e53232da9125e517f09550fdde74bf43d6a0a76ebd41674dafe2ab29")
+	return common.HexToHash("0xcae3d9f68a9ed33d0a770e9bcc6fc25d4041dd6391e6cd8015546547a3c93140")
 }
 
 func (CCIPReaderTesterCommitReportAccepted) Topic() common.Hash {
@@ -728,6 +763,8 @@ func (_CCIPReaderTester *CCIPReaderTester) Address() common.Address {
 }
 
 type CCIPReaderTesterInterface interface {
+	GetExpectedNextSequenceNumber(opts *bind.CallOpts, destChainSelector uint64) (uint64, error)
+
 	GetSourceChainConfig(opts *bind.CallOpts, sourceChainSelector uint64) (OffRampSourceChainConfig, error)
 
 	EmitCCIPSendRequested(opts *bind.TransactOpts, destChainSelector uint64, message InternalEVM2AnyRampMessage) (*types.Transaction, error)
@@ -736,6 +773,8 @@ type CCIPReaderTesterInterface interface {
 
 	EmitExecutionStateChanged(opts *bind.TransactOpts, sourceChainSelector uint64, sequenceNumber uint64, messageId [32]byte, state uint8, returnData []byte) (*types.Transaction, error)
 
+	SetDestChainSeqNr(opts *bind.TransactOpts, destChainSelector uint64, sequenceNumber uint64) (*types.Transaction, error)
+
 	SetSourceChainConfig(opts *bind.TransactOpts, sourceChainSelector uint64, sourceChainConfig OffRampSourceChainConfig) (*types.Transaction, error)
 
 	FilterCCIPSendRequested(opts *bind.FilterOpts, destChainSelector []uint64) (*CCIPReaderTesterCCIPSendRequestedIterator, error)
diff --git a/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go b/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go
new file mode 100644
index 0000000000..807a932da6
--- /dev/null
+++ b/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go
@@ -0,0 +1,3041 @@
+// Code generated - DO NOT EDIT.
+// This file is a generated binding and any manual changes will be lost.
+
+package fee_quoter
+
+import (
+	"errors"
+	"fmt"
+	"math/big"
+	"strings"
+
+	ethereum "github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/event"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
+)
+
+var (
+	_ = errors.New
+	_ = big.NewInt
+	_ = strings.NewReader
+	_ = ethereum.NotFound
+	_ = bind.Bind
+	_ = common.Big1
+	_ = types.BloomLookup
+	_ = event.NewSubscription
+	_ = abi.ConvertType
+)
+
+type AuthorizedCallersAuthorizedCallerArgs struct {
+	AddedCallers   []common.Address
+	RemovedCallers []common.Address
+}
+
+type ClientEVM2AnyMessage struct {
+	Receiver     []byte
+	Data         []byte
+	TokenAmounts []ClientEVMTokenAmount
+	FeeToken     common.Address
+	ExtraArgs    []byte
+}
+
+type ClientEVMTokenAmount struct {
+	Token  common.Address
+	Amount *big.Int
+}
+
+type FeeQuoterDestChainConfig struct {
+	IsEnabled                         bool
+	MaxNumberOfTokensPerMsg           uint16
+	MaxDataBytes                      uint32
+	MaxPerMsgGasLimit                 uint32
+	DestGasOverhead                   uint32
+	DestGasPerPayloadByte             uint16
+	DestDataAvailabilityOverheadGas   uint32
+	DestGasPerDataAvailabilityByte    uint16
+	DestDataAvailabilityMultiplierBps uint16
+	DefaultTokenFeeUSDCents           uint16
+	DefaultTokenDestGasOverhead       uint32
+	DefaultTxGasLimit                 uint32
+	GasMultiplierWeiPerEth            uint64
+	NetworkFeeUSDCents                uint32
+	EnforceOutOfOrder                 bool
+	ChainFamilySelector               [4]byte
+}
+
+type FeeQuoterDestChainConfigArgs struct {
+	DestChainSelector uint64
+	DestChainConfig   FeeQuoterDestChainConfig
+}
+
+type FeeQuoterPremiumMultiplierWeiPerEthArgs struct {
+	Token                      common.Address
+	PremiumMultiplierWeiPerEth uint64
+}
+
+type FeeQuoterStaticConfig struct {
+	MaxFeeJuelsPerMsg  *big.Int
+	LinkToken          common.Address
+	StalenessThreshold uint32
+}
+
+type FeeQuoterTokenPriceFeedUpdate struct {
+	SourceToken common.Address
+	FeedConfig  IFeeQuoterTokenPriceFeedConfig
+}
+
+type FeeQuoterTokenTransferFeeConfig struct {
+	MinFeeUSDCents    uint32
+	MaxFeeUSDCents    uint32
+	DeciBps           uint16
+	DestGasOverhead   uint32
+	DestBytesOverhead uint32
+	IsEnabled         bool
+}
+
+type FeeQuoterTokenTransferFeeConfigArgs struct {
+	DestChainSelector       uint64
+	TokenTransferFeeConfigs []FeeQuoterTokenTransferFeeConfigSingleTokenArgs
+}
+
+type FeeQuoterTokenTransferFeeConfigRemoveArgs struct {
+	DestChainSelector uint64
+	Token             common.Address
+}
+
+type FeeQuoterTokenTransferFeeConfigSingleTokenArgs struct {
+	Token                  common.Address
+	TokenTransferFeeConfig FeeQuoterTokenTransferFeeConfig
+}
+
+type IFeeQuoterTokenPriceFeedConfig struct {
+	DataFeedAddress common.Address
+	TokenDecimals   uint8
+}
+
+type InternalGasPriceUpdate struct {
+	DestChainSelector uint64
+	UsdPerUnitGas     *big.Int
+}
+
+type InternalPriceUpdates struct {
+	TokenPriceUpdates []InternalTokenPriceUpdate
+	GasPriceUpdates   []InternalGasPriceUpdate
+}
+
+type InternalRampTokenAmount struct {
+	SourcePoolAddress []byte
+	DestTokenAddress  []byte
+	ExtraData         []byte
+	Amount            *big.Int
+	DestExecData      []byte
+}
+
+type InternalTimestampedPackedUint224 struct {
+	Value     *big.Int
+	Timestamp uint32
+}
+
+type InternalTokenPriceUpdate struct {
+	SourceToken common.Address
+	UsdPerToken *big.Int
+}
+
+type KeystoneFeedsPermissionHandlerPermission struct {
+	Forwarder     common.Address
+	WorkflowName  [10]byte
+	ReportName    [2]byte
+	WorkflowOwner common.Address
+	IsAllowed     bool
+}
+
+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\":\"structIFeeQuoter.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\":\"structIFeeQuoter.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\":\"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\":\"structIFeeQuoter.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\"}],\"name\":\"processMessageArgs\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"msgFeeJuels\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"isOutOfOrderExecution\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"convertedExtraArgs\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"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.RampTokenAmount[]\",\"name\":\"rampTokenAmounts\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structClient.EVMTokenAmount[]\",\"name\":\"sourceTokenAmounts\",\"type\":\"tuple[]\"}],\"name\":\"processPoolReturnData\",\"outputs\":[{\"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\":\"structIFeeQuoter.TokenPriceFeedConfig\",\"name\":\"feedConfig\",\"type\":\"tuple\"}],\"internalType\":\"structFeeQuoter.TokenPriceFeedUpdate[]\",\"name\":\"tokenPriceFeedUpdates\",\"type\":\"tuple[]\"}],\"name\":\"updateTokenPriceFeeds\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	Bin: "0x60e06040523480156200001157600080fd5b506040516200775238038062007752833981016040819052620000349162001834565b8533806000816200008c5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000bf57620000bf8162000207565b5050604080518082018252838152815160008152602080820190935291810191909152620000ee9150620002b2565b5060208701516001600160a01b0316158062000112575086516001600160601b0316155b80620001265750604087015163ffffffff16155b15620001455760405163d794ef9560e01b815260040160405180910390fd5b6020878101516001600160a01b031660a05287516001600160601b031660805260408089015163ffffffff1660c05280516000815291820190526200018c90869062000401565b620001978462000549565b620001a2816200061a565b620001ad8262000a5a565b60408051600080825260208201909252620001fa91859190620001f3565b6040805180820190915260008082526020820152815260200190600190039081620001cb5790505b5062000b26565b5050505050505062001ae5565b336001600160a01b03821603620002615760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000083565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b602081015160005b815181101562000342576000828281518110620002db57620002db62001953565b60209081029190910101519050620002f560028262000e5f565b1562000338576040516001600160a01b03821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101620002ba565b50815160005b8151811015620003fb57600082828151811062000369576200036962001953565b6020026020010151905060006001600160a01b0316816001600160a01b031603620003a7576040516342bcdf7f60e11b815260040160405180910390fd5b620003b460028262000e7f565b506040516001600160a01b03821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a15060010162000348565b50505050565b60005b8251811015620004a2576200044083828151811062000427576200042762001953565b6020026020010151600b62000e7f60201b90919060201c565b1562000499578281815181106200045b576200045b62001953565b60200260200101516001600160a01b03167fdf1b1bd32a69711488d71554706bb130b1fc63a5fa1a2cd85e8440f84065ba2360405160405180910390a25b60010162000404565b5060005b81518110156200054457620004e2828281518110620004c957620004c962001953565b6020026020010151600b62000e9660201b90919060201c565b156200053b57818181518110620004fd57620004fd62001953565b60200260200101516001600160a01b03167f1795838dc8ab2ffc5f431a1729a6afa0b587f982f7b2be0b9d7187a1ef547f9160405160405180910390a25b600101620004a6565b505050565b60005b8151811015620006165760008282815181106200056d576200056d62001953565b6020908102919091018101518051818301516001600160a01b0380831660008181526007875260409081902084518154868a018051929096166001600160a81b03199091168117600160a01b60ff9384160217909255825191825293519093169683019690965293955091939092917f08a5f7f5bb38a81d8e43aca13ecd76431dbf8816ae4699affff7b00b2fc1c464910160405180910390a25050508060010190506200054c565b5050565b60005b8151811015620006165760008282815181106200063e576200063e62001953565b6020026020010151905060008383815181106200065f576200065f62001953565b6020026020010151600001519050600082602001519050816001600160401b03166000148062000698575061016081015163ffffffff16155b80620006ba57506101e08101516001600160e01b031916630a04b54b60e21b14155b80620006da5750806060015163ffffffff1681610160015163ffffffff16115b15620007055760405163c35aa79d60e01b81526001600160401b038316600482015260240162000083565b6001600160401b038216600090815260096020526040812060010154600160881b900460e01b6001600160e01b03191690036200078557816001600160401b03167fd31c671936387b2f84ed402b553bd50c0e9c20408ea4e91a836d77b8180fb7248260405162000777919062001969565b60405180910390a2620007c9565b816001600160401b03167f1edd6f3553cfa16f10b95b195abae3a1cfca4783de4843f95d674b1e1df5ab2082604051620007c0919062001969565b60405180910390a25b8060096000846001600160401b03166001600160401b0316815260200190815260200160002060008201518160000160006101000a81548160ff02191690831515021790555060208201518160000160016101000a81548161ffff021916908361ffff16021790555060408201518160000160036101000a81548163ffffffff021916908363ffffffff16021790555060608201518160000160076101000a81548163ffffffff021916908363ffffffff160217905550608082015181600001600b6101000a81548163ffffffff021916908363ffffffff16021790555060a082015181600001600f6101000a81548161ffff021916908361ffff16021790555060c08201518160000160116101000a81548163ffffffff021916908363ffffffff16021790555060e08201518160000160156101000a81548161ffff021916908361ffff1602179055506101008201518160000160176101000a81548161ffff021916908361ffff1602179055506101208201518160000160196101000a81548161ffff021916908361ffff16021790555061014082015181600001601b6101000a81548163ffffffff021916908363ffffffff1602179055506101608201518160010160006101000a81548163ffffffff021916908363ffffffff1602179055506101808201518160010160046101000a8154816001600160401b0302191690836001600160401b031602179055506101a082015181600101600c6101000a81548163ffffffff021916908363ffffffff1602179055506101c08201518160010160106101000a81548160ff0219169083151502179055506101e08201518160010160116101000a81548163ffffffff021916908360e01c02179055509050505050508060010190506200061d565b60005b81518110156200061657600082828151811062000a7e5762000a7e62001953565b6020026020010151600001519050600083838151811062000aa35762000aa362001953565b6020908102919091018101518101516001600160a01b03841660008181526008845260409081902080546001600160401b0319166001600160401b0385169081179091559051908152919350917fbb77da6f7210cdd16904228a9360133d1d7dfff99b1bc75f128da5b53e28f97d910160405180910390a2505060010162000a5d565b60005b825181101562000d9957600083828151811062000b4a5762000b4a62001953565b6020026020010151905060008160000151905060005b82602001515181101562000d8a5760008360200151828151811062000b895762000b8962001953565b602002602001015160200151905060008460200151838151811062000bb25762000bb262001953565b6020026020010151600001519050602063ffffffff16826080015163ffffffff16101562000c115760808201516040516312766e0160e11b81526001600160a01b038316600482015263ffffffff909116602482015260440162000083565b6001600160401b0384166000818152600a602090815260408083206001600160a01b0386168085529083529281902086518154938801518389015160608a015160808b015160a08c01511515600160901b0260ff60901b1963ffffffff928316600160701b021664ffffffffff60701b199383166a01000000000000000000000263ffffffff60501b1961ffff90961668010000000000000000029590951665ffffffffffff60401b19968416640100000000026001600160401b0319909b16939097169290921798909817939093169390931717919091161792909217909155519091907f94967ae9ea7729ad4f54021c1981765d2b1d954f7c92fbec340aa0a54f46b8b59062000d77908690600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60405180910390a3505060010162000b60565b50505080600101905062000b29565b5060005b81518110156200054457600082828151811062000dbe5762000dbe62001953565b6020026020010151600001519050600083838151811062000de35762000de362001953565b6020908102919091018101518101516001600160401b0384166000818152600a845260408082206001600160a01b038516808452955280822080546001600160981b03191690555192945090917f4de5b1bcbca6018c11303a2c3f4a4b4f22a1c741d8c4ba430d246ac06c5ddf8b9190a3505060010162000d9d565b600062000e76836001600160a01b03841662000ead565b90505b92915050565b600062000e76836001600160a01b03841662000fb1565b600062000e76836001600160a01b03841662001003565b6000818152600183016020526040812054801562000fa657600062000ed460018362001aad565b855490915060009062000eea9060019062001aad565b905081811462000f5657600086600001828154811062000f0e5762000f0e62001953565b906000526020600020015490508087600001848154811062000f345762000f3462001953565b6000918252602080832090910192909255918252600188019052604090208390555b855486908062000f6a5762000f6a62001acf565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505062000e79565b600091505062000e79565b600081815260018301602052604081205462000ffa5750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915562000e79565b50600062000e79565b6000818152600183016020526040812054801562000fa65760006200102a60018362001aad565b8554909150600090620010409060019062001aad565b905080821462000f5657600086600001828154811062000f0e5762000f0e62001953565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156200109f576200109f62001064565b60405290565b60405160c081016001600160401b03811182821017156200109f576200109f62001064565b60405161020081016001600160401b03811182821017156200109f576200109f62001064565b604051601f8201601f191681016001600160401b03811182821017156200111b576200111b62001064565b604052919050565b80516001600160a01b03811681146200113b57600080fd5b919050565b805163ffffffff811681146200113b57600080fd5b6000606082840312156200116857600080fd5b604051606081016001600160401b03811182821017156200118d576200118d62001064565b604052825190915081906001600160601b0381168114620011ad57600080fd5b8152620011bd6020840162001123565b6020820152620011d06040840162001140565b60408201525092915050565b60006001600160401b03821115620011f857620011f862001064565b5060051b60200190565b600082601f8301126200121457600080fd5b815160206200122d6200122783620011dc565b620010f0565b8083825260208201915060208460051b8701019350868411156200125057600080fd5b602086015b848110156200127757620012698162001123565b835291830191830162001255565b509695505050505050565b600082601f8301126200129457600080fd5b81516020620012a76200122783620011dc565b82815260609283028501820192828201919087851115620012c757600080fd5b8387015b858110156200135a5780890382811215620012e65760008081fd5b620012f06200107a565b620012fb8362001123565b8152604080601f1984011215620013125760008081fd5b6200131c6200107a565b92506200132b88850162001123565b835283015160ff81168114620013415760008081fd5b82880152808701919091528452928401928101620012cb565b5090979650505050505050565b80516001600160401b03811681146200113b57600080fd5b805161ffff811681146200113b57600080fd5b805180151581146200113b57600080fd5b600082601f830112620013b557600080fd5b81516020620013c86200122783620011dc565b82815260059290921b84018101918181019086841115620013e857600080fd5b8286015b84811015620012775780516001600160401b03808211156200140d57600080fd5b908801906040601f19838c0381018213156200142857600080fd5b620014326200107a565b6200143f89860162001367565b815282850151848111156200145357600080fd5b8086019550508c603f8601126200146957600080fd5b8885015193506200147e6200122785620011dc565b84815260e09094028501830193898101908e8611156200149d57600080fd5b958401955b858710156200157657868f0360e0811215620014bd57600080fd5b620014c76200107a565b620014d28962001123565b815260c08683011215620014e557600080fd5b620014ef620010a5565b9150620014fe8d8a0162001140565b82526200150d878a0162001140565b8d8301526200151f60608a016200137f565b878301526200153160808a0162001140565b60608301526200154460a08a0162001140565b60808301526200155760c08a0162001392565b60a0830152808d0191909152825260e09690960195908a0190620014a2565b828b015250875250505092840192508301620013ec565b600082601f8301126200159f57600080fd5b81516020620015b26200122783620011dc565b82815260069290921b84018101918181019086841115620015d257600080fd5b8286015b84811015620012775760408189031215620015f15760008081fd5b620015fb6200107a565b620016068262001123565b81526200161585830162001367565b81860152835291830191604001620015d6565b80516001600160e01b0319811681146200113b57600080fd5b600082601f8301126200165357600080fd5b81516020620016666200122783620011dc565b82815261022092830285018201928282019190878511156200168757600080fd5b8387015b858110156200135a5780890382811215620016a65760008081fd5b620016b06200107a565b620016bb8362001367565b815261020080601f1984011215620016d35760008081fd5b620016dd620010ca565b9250620016ec88850162001392565b83526040620016fd8186016200137f565b8985015260606200171081870162001140565b82860152608091506200172582870162001140565b9085015260a06200173886820162001140565b8286015260c091506200174d8287016200137f565b9085015260e06200176086820162001140565b828601526101009150620017768287016200137f565b908501526101206200178a8682016200137f565b828601526101409150620017a08287016200137f565b90850152610160620017b486820162001140565b828601526101809150620017ca82870162001140565b908501526101a0620017de86820162001367565b828601526101c09150620017f482870162001140565b908501526101e06200180886820162001392565b828601526200181983870162001628565b9085015250508087019190915284529284019281016200168b565b6000806000806000806000610120888a0312156200185157600080fd5b6200185d898962001155565b60608901519097506001600160401b03808211156200187b57600080fd5b620018898b838c0162001202565b975060808a0151915080821115620018a057600080fd5b620018ae8b838c0162001202565b965060a08a0151915080821115620018c557600080fd5b620018d38b838c0162001282565b955060c08a0151915080821115620018ea57600080fd5b620018f88b838c01620013a3565b945060e08a01519150808211156200190f57600080fd5b6200191d8b838c016200158d565b93506101008a01519150808211156200193557600080fd5b50620019448a828b0162001641565b91505092959891949750929550565b634e487b7160e01b600052603260045260246000fd5b815115158152610200810160208301516200198a602084018261ffff169052565b506040830151620019a3604084018263ffffffff169052565b506060830151620019bc606084018263ffffffff169052565b506080830151620019d5608084018263ffffffff169052565b5060a0830151620019ec60a084018261ffff169052565b5060c083015162001a0560c084018263ffffffff169052565b5060e083015162001a1c60e084018261ffff169052565b506101008381015161ffff9081169184019190915261012080850151909116908301526101408084015163ffffffff9081169184019190915261016080850151821690840152610180808501516001600160401b0316908401526101a080850151909116908301526101c0808401511515908301526101e0928301516001600160e01b031916929091019190915290565b8181038181111562000e7957634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603160045260246000fd5b60805160a05160c051615c1362001b3f600039600081816102ef0152818161220b01526122740152600081816102b301528181611917015261197701526000818161027f015281816119a00152611a100152615c136000f3fe608060405234801561001057600080fd5b50600436106101ce5760003560e01c806379ba509711610104578063a69c64c0116100a2578063d02641a011610071578063d02641a014610a81578063d8694ccd14610a94578063f2fde38b14610aa7578063ffdb4b3714610aba57600080fd5b8063a69c64c014610997578063bf78e03f146109aa578063c4276bfc14610a57578063cdc73d5114610a7957600080fd5b806382b49eb0116100de57806382b49eb0146107d95780638da5cb5b1461094957806391a2749a146109715780639ea600261461098457600080fd5b806379ba5097146107ab5780637afac322146107b3578063805f2132146107c657600080fd5b8063407e1086116101715780634ab35b0b1161014b5780634ab35b0b14610441578063514e8cff146104815780636def4ce714610524578063770e2dc41461079857600080fd5b8063407e1086146103fb57806341ed29e71461040e57806345ac924d1461042157600080fd5b8063085318f8116101ad578063085318f814610368578063181f5a77146103885780632451a627146103d15780633937306f146103e657600080fd5b806241e5be146101d3578063061877e3146101f957806306285c6914610252575b600080fd5b6101e66101e13660046142ca565b610b02565b6040519081526020015b60405180910390f35b610239610207366004614306565b73ffffffffffffffffffffffffffffffffffffffff1660009081526008602052604090205467ffffffffffffffff1690565b60405167ffffffffffffffff90911681526020016101f0565b61031c604080516060810182526000808252602082018190529181019190915260405180606001604052807f00000000000000000000000000000000000000000000000000000000000000006bffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000063ffffffff16815250905090565b6040805182516bffffffffffffffffffffffff16815260208084015173ffffffffffffffffffffffffffffffffffffffff16908201529181015163ffffffff16908201526060016101f0565b61037b61037636600461437e565b610b70565b6040516101f09190614490565b6103c46040518060400160405280601381526020017f46656551756f74657220312e362e302d6465760000000000000000000000000081525081565b6040516101f09190614512565b6103d9610ee2565b6040516101f09190614525565b6103f96103f436600461457f565b610ef3565b005b6103f9610409366004614721565b6111a8565b6103f961041c366004614853565b6111bc565b61043461042f36600461498e565b6111fe565b6040516101f091906149d0565b61045461044f366004614306565b6112c9565b6040517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff90911681526020016101f0565b61051761048f366004614a4b565b60408051808201909152600080825260208201525067ffffffffffffffff166000908152600560209081526040918290208251808401909352547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811683527c0100000000000000000000000000000000000000000000000000000000900463ffffffff169082015290565b6040516101f09190614a66565b61078b610532366004614a4b565b6040805161020081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e08101829052610100810182905261012081018290526101408101829052610160810182905261018081018290526101a081018290526101c081018290526101e08101919091525067ffffffffffffffff908116600090815260096020908152604091829020825161020081018452815460ff8082161515835261ffff61010080840482169685019690965263ffffffff630100000084048116978501979097526701000000000000008304871660608501526b0100000000000000000000008304871660808501526f010000000000000000000000000000008304811660a085015271010000000000000000000000000000000000808404881660c086015275010000000000000000000000000000000000000000008404821660e08087019190915277010000000000000000000000000000000000000000000000850483169786019790975279010000000000000000000000000000000000000000000000000084049091166101208501527b01000000000000000000000000000000000000000000000000000000909204861661014084015260019093015480861661016084015264010000000081049096166101808301526c0100000000000000000000000086049094166101a0820152700100000000000000000000000000000000850490911615156101c08201527fffffffff0000000000000000000000000000000000000000000000000000000092909304901b166101e082015290565b6040516101f09190614aa1565b6103f96107a6366004614cb8565b6112d4565b6103f96112e6565b6103f96107c1366004614fd2565b6113e3565b6103f96107d4366004615078565b6113f5565b6108e96107e73660046150e4565b6040805160c081018252600080825260208201819052918101829052606081018290526080810182905260a08101919091525067ffffffffffffffff919091166000908152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff94909416835292815290829020825160c081018452905463ffffffff8082168352640100000000820481169383019390935268010000000000000000810461ffff16938201939093526a01000000000000000000008304821660608201526e01000000000000000000000000000083049091166080820152720100000000000000000000000000000000000090910460ff16151560a082015290565b6040516101f09190600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60005460405173ffffffffffffffffffffffffffffffffffffffff90911681526020016101f0565b6103f961097f36600461510e565b6118dd565b6103f96109923660046151cf565b6118ee565b6103f96109a53660046153dc565b6118ff565b610a236109b8366004614306565b6040805180820182526000808252602091820181905273ffffffffffffffffffffffffffffffffffffffff93841681526007825282902082518084019093525492831682527401000000000000000000000000000000000000000090920460ff169181019190915290565b60408051825173ffffffffffffffffffffffffffffffffffffffff16815260209283015160ff1692810192909252016101f0565b610a6a610a653660046154a1565b611910565b6040516101f093929190615510565b6103d9611b06565b610517610a8f366004614306565b611b12565b6101e6610aa2366004615531565b611c0e565b6103f9610ab5366004614306565b612126565b610acd610ac8366004615586565b612137565b604080517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff9384168152929091166020830152016101f0565b6000610b0d826122c2565b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16610b34856122c2565b610b5c907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16856155df565b610b6691906155f6565b90505b9392505050565b67ffffffffffffffff8086166000908152600960205260409020600101546060917101000000000000000000000000000000000090910460e01b908590811115610bbc57610bbc6145ba565b604051908082528060200260200182016040528015610bef57816020015b6060815260200190600190039081610bda5790505b50915060005b85811015610ed7576000858583818110610c1157610c11615631565b610c279260206040909202019081019150614306565b90506000888884818110610c3d57610c3d615631565b9050602002810190610c4f9190615660565b610c5d90604081019061569e565b9150506020811115610d125767ffffffffffffffff8a166000908152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff861684529091529020546e010000000000000000000000000000900463ffffffff16811115610d12576040517f36f536ca00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff831660048201526024015b60405180910390fd5b610d82848a8a86818110610d2857610d28615631565b9050602002810190610d3a9190615660565b610d4890602081019061569e565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061235c92505050565b67ffffffffffffffff8a166000818152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff871684528252808320815160c081018352905463ffffffff8082168352640100000000820481168386015268010000000000000000820461ffff16838501526a01000000000000000000008204811660608401526e010000000000000000000000000000820481166080840152720100000000000000000000000000000000000090910460ff16151560a08301908152958552600990935290832054935190937b0100000000000000000000000000000000000000000000000000000090049091169190610e815781610e87565b82606001515b6040805163ffffffff8316602082015291925001604051602081830303815290604052888781518110610ebc57610ebc615631565b60200260200101819052505050505050806001019050610bf5565b505095945050505050565b6060610eee60026123b3565b905090565b610efb6123c0565b6000610f078280615703565b9050905060005b81811015611051576000610f228480615703565b83818110610f3257610f32615631565b905060400201803603810190610f489190615797565b604080518082018252602080840180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff908116845263ffffffff42818116858701908152885173ffffffffffffffffffffffffffffffffffffffff9081166000908152600690975295889020965190519092167c010000000000000000000000000000000000000000000000000000000002919092161790935584519051935194955016927f52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a926110409290917bffffffffffffffffffffffffffffffffffffffffffffffffffffffff929092168252602082015260400190565b60405180910390a250600101610f0e565b5060006110616020840184615703565b9050905060005b818110156111a257600061107f6020860186615703565b8381811061108f5761108f615631565b9050604002018036038101906110a591906157d4565b604080518082018252602080840180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff908116845263ffffffff42818116858701908152885167ffffffffffffffff9081166000908152600590975295889020965190519092167c010000000000000000000000000000000000000000000000000000000002919092161790935584519051935194955016927fdd84a3fa9ef9409f550d54d6affec7e9c480c878c6ab27b78912a03e1b371c6e926111919290917bffffffffffffffffffffffffffffffffffffffffffffffffffffffff929092168252602082015260400190565b60405180910390a250600101611068565b50505050565b6111b0612405565b6111b981612486565b50565b6111c4612405565b60005b81518110156111fa576111f28282815181106111e5576111e5615631565b6020026020010151612584565b6001016111c7565b5050565b60608160008167ffffffffffffffff81111561121c5761121c6145ba565b60405190808252806020026020018201604052801561126157816020015b604080518082019091526000808252602082015281526020019060019003908161123a5790505b50905060005b828110156112be5761129986868381811061128457611284615631565b9050602002016020810190610a8f9190614306565b8282815181106112ab576112ab615631565b6020908102919091010152600101611267565b509150505b92915050565b60006112c3826122c2565b6112dc612405565b6111fa8282612756565b60015473ffffffffffffffffffffffffffffffffffffffff163314611367576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e6572000000000000000000006044820152606401610d09565b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b6113eb612405565b6111fa8282612b63565b600080600061143987878080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250612caa92505050565b92509250925061144b33838584612cc5565b6000611459858701876157f7565b905060005b81518110156118d25760006007600084848151811061147f5761147f615631565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff16825281019190915260400160009081205474010000000000000000000000000000000000000000900460ff169150819003611540578282815181106114e9576114e9615631565b6020908102919091010151516040517f06439c6b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091166004820152602401610d09565b600061158960128386868151811061155a5761155a615631565b6020026020010151602001517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16612e1d565b9050600660008585815181106115a1576115a1615631565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001601c9054906101000a900463ffffffff1663ffffffff1684848151811061161357611613615631565b60200260200101516040015163ffffffff16101561171d5783838151811061163d5761163d615631565b60200260200101516000015184848151811061165b5761165b615631565b6020026020010151604001516006600087878151811061167d5761167d615631565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff90811683529082019290925260409081016000205490517f191ec70600000000000000000000000000000000000000000000000000000000815293909116600484015263ffffffff91821660248401527c01000000000000000000000000000000000000000000000000000000009004166044820152606401610d09565b6040518060400160405280827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16815260200185858151811061175e5761175e615631565b60200260200101516040015163ffffffff168152506006600086868151811061178957611789615631565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040016000208251929091015163ffffffff167c0100000000000000000000000000000000000000000000000000000000027bffffffffffffffffffffffffffffffffffffffffffffffffffffffff909216919091179055835184908490811061182157611821615631565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff167f52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a8286868151811061187757611877615631565b6020026020010151604001516040516118c09291907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff92909216825263ffffffff16602082015260400190565b60405180910390a2505060010161145e565b505050505050505050565b6118e5612405565b6111b981612ee3565b6118f6612405565b6111b98161306f565b611907612405565b6111b981613515565b60008060607f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168773ffffffffffffffffffffffffffffffffffffffff16036119705785925061199e565b61199b87877f0000000000000000000000000000000000000000000000000000000000000000610b02565b92505b7f00000000000000000000000000000000000000000000000000000000000000006bffffffffffffffffffffffff16831115611a3d576040517f6a92a483000000000000000000000000000000000000000000000000000000008152600481018490526bffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000166024820152604401610d09565b67ffffffffffffffff881660009081526009602052604081206001015463ffffffff1690611a6c8787846135ff565b9050806020015193508484611af3836040805182516024820152602092830151151560448083019190915282518083039091018152606490910190915290810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f181dcf100000000000000000000000000000000000000000000000000000000017905290565b9450945094505050955095509592505050565b6060610eee600b6123b3565b604080518082019091526000808252602082015273ffffffffffffffffffffffffffffffffffffffff8281166000908152600760209081526040918290208251808401909352549283168083527401000000000000000000000000000000000000000090930460ff169082015290611c0557505073ffffffffffffffffffffffffffffffffffffffff166000908152600660209081526040918290208251808401909352547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811683527c0100000000000000000000000000000000000000000000000000000000900463ffffffff169082015290565b610b69816137a8565b67ffffffffffffffff8083166000908152600960209081526040808320815161020081018352815460ff808216151580845261ffff61010080850482169886019890985263ffffffff630100000085048116978601979097526701000000000000008404871660608601526b0100000000000000000000008404871660808601526f010000000000000000000000000000008404811660a086015271010000000000000000000000000000000000808504881660c087015275010000000000000000000000000000000000000000008504821660e08088019190915277010000000000000000000000000000000000000000000000860483169987019990995279010000000000000000000000000000000000000000000000000085049091166101208601527b01000000000000000000000000000000000000000000000000000000909304861661014085015260019094015480861661016085015264010000000081049098166101808401526c0100000000000000000000000088049094166101a0830152700100000000000000000000000000000000870490931615156101c08201527fffffffff000000000000000000000000000000000000000000000000000000009290950490921b166101e0840152909190611e28576040517f99ac52f200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff85166004820152602401610d09565b611e43611e3b6080850160608601614306565b600b90613937565b611ea257611e576080840160608501614306565b6040517f2502348c00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091166004820152602401610d09565b6000611eb16040850185615703565b9150611f0d905082611ec6602087018761569e565b905083611ed3888061569e565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061396692505050565b6000600881611f226080880160608901614306565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160009081205467ffffffffffffffff16915080611f71611f6b6080890160608a01614306565b89612137565b9092509050600080808615611fb757611fab888c611f9560808e0160608f01614306565b888e8060400190611fa69190615703565b613a10565b91945092509050611fd7565b6101a0880151611fd49063ffffffff16662386f26fc100006155df565b92505b61010088015160009061ffff161561201b57612018896dffffffffffffffffffffffffffff607088901c1661200f60208f018f61569e565b90508b86613ce8565b90505b61018089015160009067ffffffffffffffff1661204461203e60808f018f61569e565b8d613d98565b600001518563ffffffff168c60a0015161ffff168f8060200190612068919061569e565b6120739291506155df565b8d6080015163ffffffff1661208891906158be565b61209291906158be565b61209c91906158be565b6120b6906dffffffffffffffffffffffffffff89166155df565b6120c091906155df565b90507bffffffffffffffffffffffffffffffffffffffffffffffffffffffff871682826120f767ffffffffffffffff8c16896155df565b61210191906158be565b61210b91906158be565b61211591906155f6565b9d9c50505050505050505050505050565b61212e612405565b6111b981613e59565b67ffffffffffffffff811660009081526005602090815260408083208151808301909252547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811682527c0100000000000000000000000000000000000000000000000000000000900463ffffffff16918101829052829182036121ef576040517f2e59db3a00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff85166004820152602401610d09565b6000816020015163ffffffff164261220791906158d1565b90507f000000000000000000000000000000000000000000000000000000000000000063ffffffff168111156122a8576040517ff08bcb3e00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8616600482015263ffffffff7f000000000000000000000000000000000000000000000000000000000000000016602482015260448101829052606401610d09565b6122b1866122c2565b9151919350909150505b9250929050565b6000806122ce83611b12565b9050806020015163ffffffff1660001480612306575080517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16155b15612355576040517f06439c6b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff84166004820152602401610d09565b5192915050565b7fd7ed2ad4000000000000000000000000000000000000000000000000000000007fffffffff000000000000000000000000000000000000000000000000000000008316016111fa576123ae81613f4e565b505050565b60606000610b6983614001565b6123cb600233613937565b612403576040517fd86ad9cf000000000000000000000000000000000000000000000000000000008152336004820152602401610d09565b565b60005473ffffffffffffffffffffffffffffffffffffffff163314612403576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610d09565b60005b81518110156111fa5760008282815181106124a6576124a6615631565b60209081029190910181015180518183015173ffffffffffffffffffffffffffffffffffffffff80831660008181526007875260409081902084518154868a018051929096167fffffffffffffffffffffff00000000000000000000000000000000000000000090911681177401000000000000000000000000000000000000000060ff9384160217909255825191825293519093169683019690965293955091939092917f08a5f7f5bb38a81d8e43aca13ecd76431dbf8816ae4699affff7b00b2fc1c464910160405180910390a2505050806001019050612489565b600061263d82600001518360600151846020015185604001516040805173ffffffffffffffffffffffffffffffffffffffff80871660208301528516918101919091527fffffffffffffffffffff00000000000000000000000000000000000000000000831660608201527fffff0000000000000000000000000000000000000000000000000000000000008216608082015260009060a001604051602081830303815290604052805190602001209050949350505050565b60808301516000828152600460205260409081902080549215157fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00909316929092179091555190915081907f32a4ba3fa3351b11ad555d4c8ec70a744e8705607077a946807030d64b6ab1a39061274a908590600060a08201905073ffffffffffffffffffffffffffffffffffffffff8084511683527fffffffffffffffffffff0000000000000000000000000000000000000000000060208501511660208401527fffff00000000000000000000000000000000000000000000000000000000000060408501511660408401528060608501511660608401525060808301511515608083015292915050565b60405180910390a25050565b60005b8251811015612a7f57600083828151811061277657612776615631565b6020026020010151905060008160000151905060005b826020015151811015612a71576000836020015182815181106127b1576127b1615631565b60200260200101516020015190506000846020015183815181106127d7576127d7615631565b6020026020010151600001519050602063ffffffff16826080015163ffffffff16101561285a5760808201516040517f24ecdc0200000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8316600482015263ffffffff9091166024820152604401610d09565b67ffffffffffffffff84166000818152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff86168085529083529281902086518154938801518389015160608a015160808b015160a08c015115157201000000000000000000000000000000000000027fffffffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffff63ffffffff9283166e01000000000000000000000000000002167fffffffffffffffffffffffffff0000000000ffffffffffffffffffffffffffff9383166a0100000000000000000000027fffffffffffffffffffffffffffffffffffff00000000ffffffffffffffffffff61ffff9096166801000000000000000002959095167fffffffffffffffffffffffffffffffffffff000000000000ffffffffffffffff968416640100000000027fffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000909b16939097169290921798909817939093169390931717919091161792909217909155519091907f94967ae9ea7729ad4f54021c1981765d2b1d954f7c92fbec340aa0a54f46b8b590612a5f908690600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60405180910390a3505060010161278c565b505050806001019050612759565b5060005b81518110156123ae576000828281518110612aa057612aa0615631565b60200260200101516000015190506000838381518110612ac257612ac2615631565b60209081029190910181015181015167ffffffffffffffff84166000818152600a8452604080822073ffffffffffffffffffffffffffffffffffffffff8516808452955280822080547fffffffffffffffffffffffffff000000000000000000000000000000000000001690555192945090917f4de5b1bcbca6018c11303a2c3f4a4b4f22a1c741d8c4ba430d246ac06c5ddf8b9190a35050600101612a83565b60005b8251811015612c0657612b9c838281518110612b8457612b84615631565b6020026020010151600b61405d90919063ffffffff16565b15612bfe57828181518110612bb357612bb3615631565b602002602001015173ffffffffffffffffffffffffffffffffffffffff167fdf1b1bd32a69711488d71554706bb130b1fc63a5fa1a2cd85e8440f84065ba2360405160405180910390a25b600101612b66565b5060005b81518110156123ae57612c40828281518110612c2857612c28615631565b6020026020010151600b61407f90919063ffffffff16565b15612ca257818181518110612c5757612c57615631565b602002602001015173ffffffffffffffffffffffffffffffffffffffff167f1795838dc8ab2ffc5f431a1729a6afa0b587f982f7b2be0b9d7187a1ef547f9160405160405180910390a25b600101612c0a565b6040810151604a820151605e90920151909260609290921c91565b6040805173ffffffffffffffffffffffffffffffffffffffff868116602080840191909152908616828401527fffffffffffffffffffff00000000000000000000000000000000000000000000851660608301527fffff00000000000000000000000000000000000000000000000000000000000084166080808401919091528351808403909101815260a09092018352815191810191909120600081815260049092529190205460ff16612e16576040517f097e17ff00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8087166004830152851660248201527fffffffffffffffffffff00000000000000000000000000000000000000000000841660448201527fffff00000000000000000000000000000000000000000000000000000000000083166064820152608401610d09565b5050505050565b600080612e2a84866158e4565b9050600060248260ff161115612e6157612e456024836158fd565b612e5090600a615a36565b612e5a90856155f6565b9050612e84565b612e6c8260246158fd565b612e7790600a615a36565b612e8190856155df565b90505b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811115612eda576040517f10cb51d100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b95945050505050565b602081015160005b8151811015612f7e576000828281518110612f0857612f08615631565b60200260200101519050612f268160026140a190919063ffffffff16565b15612f755760405173ffffffffffffffffffffffffffffffffffffffff821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101612eeb565b50815160005b81518110156111a2576000828281518110612fa157612fa1615631565b60200260200101519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603613011576040517f8579befe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61301c60028261405d565b5060405173ffffffffffffffffffffffffffffffffffffffff821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a150600101612f84565b60005b81518110156111fa57600082828151811061308f5761308f615631565b6020026020010151905060008383815181106130ad576130ad615631565b60200260200101516000015190506000826020015190508167ffffffffffffffff16600014806130e6575061016081015163ffffffff16155b8061313857506101e08101517fffffffff00000000000000000000000000000000000000000000000000000000167f2812d52c0000000000000000000000000000000000000000000000000000000014155b806131575750806060015163ffffffff1681610160015163ffffffff16115b1561319a576040517fc35aa79d00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff83166004820152602401610d09565b67ffffffffffffffff821660009081526009602052604081206001015471010000000000000000000000000000000000900460e01b7fffffffff0000000000000000000000000000000000000000000000000000000016900361323e578167ffffffffffffffff167fd31c671936387b2f84ed402b553bd50c0e9c20408ea4e91a836d77b8180fb724826040516132319190614aa1565b60405180910390a2613281565b8167ffffffffffffffff167f1edd6f3553cfa16f10b95b195abae3a1cfca4783de4843f95d674b1e1df5ab20826040516132789190614aa1565b60405180910390a25b80600960008467ffffffffffffffff1667ffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548160ff02191690831515021790555060208201518160000160016101000a81548161ffff021916908361ffff16021790555060408201518160000160036101000a81548163ffffffff021916908363ffffffff16021790555060608201518160000160076101000a81548163ffffffff021916908363ffffffff160217905550608082015181600001600b6101000a81548163ffffffff021916908363ffffffff16021790555060a082015181600001600f6101000a81548161ffff021916908361ffff16021790555060c08201518160000160116101000a81548163ffffffff021916908363ffffffff16021790555060e08201518160000160156101000a81548161ffff021916908361ffff1602179055506101008201518160000160176101000a81548161ffff021916908361ffff1602179055506101208201518160000160196101000a81548161ffff021916908361ffff16021790555061014082015181600001601b6101000a81548163ffffffff021916908363ffffffff1602179055506101608201518160010160006101000a81548163ffffffff021916908363ffffffff1602179055506101808201518160010160046101000a81548167ffffffffffffffff021916908367ffffffffffffffff1602179055506101a082015181600101600c6101000a81548163ffffffff021916908363ffffffff1602179055506101c08201518160010160106101000a81548160ff0219169083151502179055506101e08201518160010160116101000a81548163ffffffff021916908360e01c0217905550905050505050806001019050613072565b60005b81518110156111fa57600082828151811061353557613535615631565b6020026020010151600001519050600083838151811061355757613557615631565b60209081029190910181015181015173ffffffffffffffffffffffffffffffffffffffff841660008181526008845260409081902080547fffffffffffffffffffffffffffffffffffffffffffffffff00000000000000001667ffffffffffffffff85169081179091559051908152919350917fbb77da6f7210cdd16904228a9360133d1d7dfff99b1bc75f128da5b53e28f97d910160405180910390a25050600101613518565b6040805180820190915260008082526020820152600083900361364057506040805180820190915267ffffffffffffffff8216815260006020820152610b69565b600061364c8486615a45565b9050600061365d8560048189615a8b565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509293505050507fffffffff0000000000000000000000000000000000000000000000000000000082167fe7e230f000000000000000000000000000000000000000000000000000000000016136fa57808060200190518101906136f19190615ab5565b92505050610b69565b7f6859a837000000000000000000000000000000000000000000000000000000007fffffffff00000000000000000000000000000000000000000000000000000000831601613776576040518060400160405280828060200190518101906137629190615ae1565b815260006020909101529250610b69915050565b6040517f5247fdce00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b604080518082019091526000808252602082015260008260000151905060008173ffffffffffffffffffffffffffffffffffffffff1663feaf968c6040518163ffffffff1660e01b815260040160a060405180830381865afa158015613812573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906138369190615b14565b5050509150506000811215613877576040517f10cb51d100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006138f68373ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156138c7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906138eb9190615b64565b866020015184612e1d565b604080518082019091527bffffffffffffffffffffffffffffffffffffffffffffffffffffffff909116815263ffffffff4216602082015295945050505050565b73ffffffffffffffffffffffffffffffffffffffff811660009081526001830160205260408120541515610b69565b836040015163ffffffff168311156139bf5760408085015190517f8693378900000000000000000000000000000000000000000000000000000000815263ffffffff909116600482015260248101849052604401610d09565b836020015161ffff16821115613a01576040517f4c056b6a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6111a2846101e001518261235c565b6000808083815b81811015613cda576000878783818110613a3357613a33615631565b905060400201803603810190613a499190615b81565b67ffffffffffffffff8c166000908152600a60209081526040808320845173ffffffffffffffffffffffffffffffffffffffff168452825291829020825160c081018452905463ffffffff8082168352640100000000820481169383019390935268010000000000000000810461ffff16938201939093526a01000000000000000000008304821660608201526e01000000000000000000000000000083049091166080820152720100000000000000000000000000000000000090910460ff16151560a0820181905291925090613b69576101208d0151613b369061ffff16662386f26fc100006155df565b613b4090886158be565b96508c610140015186613b539190615bba565b9550613b60602086615bba565b94505050613cd2565b604081015160009061ffff1615613c225760008c73ffffffffffffffffffffffffffffffffffffffff16846000015173ffffffffffffffffffffffffffffffffffffffff1614613bc5578351613bbe906122c2565b9050613bc8565b508a5b620186a0836040015161ffff16613c0a8660200151847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff166140c390919063ffffffff16565b613c1491906155df565b613c1e91906155f6565b9150505b6060820151613c319088615bba565b9650816080015186613c439190615bba565b8251909650600090613c629063ffffffff16662386f26fc100006155df565b905080821015613c8157613c76818a6158be565b985050505050613cd2565b6000836020015163ffffffff16662386f26fc10000613ca091906155df565b905080831115613cc057613cb4818b6158be565b99505050505050613cd2565b613cca838b6158be565b995050505050505b600101613a17565b505096509650969350505050565b60008063ffffffff8316613cfe610160866155df565b613d0a876101c06158be565b613d1491906158be565b613d1e91906158be565b905060008760c0015163ffffffff168860e0015161ffff1683613d4191906155df565b613d4b91906158be565b61010089015190915061ffff16613d726dffffffffffffffffffffffffffff8916836155df565b613d7c91906155df565b613d8c90655af3107a40006155df565b98975050505050505050565b60408051808201909152600080825260208201526000613dc4858585610160015163ffffffff166135ff565b9050826060015163ffffffff1681600001511115613e0e576040517f4c4fc93a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b826101c001518015613e2257508060200151155b15610b66576040517fee433e9900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff821603613ed8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610d09565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b60008151602014613f8d57816040517f8d666f60000000000000000000000000000000000000000000000000000000008152600401610d099190614512565b600082806020019051810190613fa39190615ae1565b905073ffffffffffffffffffffffffffffffffffffffff811180613fc8575061040081105b156112c357826040517f8d666f60000000000000000000000000000000000000000000000000000000008152600401610d099190614512565b60608160000180548060200260200160405190810160405280929190818152602001828054801561405157602002820191906000526020600020905b81548152602001906001019080831161403d575b50505050509050919050565b6000610b698373ffffffffffffffffffffffffffffffffffffffff8416614100565b6000610b698373ffffffffffffffffffffffffffffffffffffffff841661414f565b6000610b698373ffffffffffffffffffffffffffffffffffffffff8416614249565b6000670de0b6b3a76400006140f6837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff86166155df565b610b6991906155f6565b6000818152600183016020526040812054614147575081546001818101845560008481526020808220909301849055845484825282860190935260409020919091556112c3565b5060006112c3565b600081815260018301602052604081205480156142385760006141736001836158d1565b8554909150600090614187906001906158d1565b90508082146141ec5760008660000182815481106141a7576141a7615631565b90600052602060002001549050808760000184815481106141ca576141ca615631565b6000918252602080832090910192909255918252600188019052604090208390555b85548690806141fd576141fd615bd7565b6001900381819060005260206000200160009055905585600101600086815260200190815260200160002060009055600193505050506112c3565b60009150506112c3565b5092915050565b6000818152600183016020526040812054801561423857600061426d6001836158d1565b8554909150600090614281906001906158d1565b90508181146141ec5760008660000182815481106141a7576141a7615631565b803573ffffffffffffffffffffffffffffffffffffffff811681146142c557600080fd5b919050565b6000806000606084860312156142df57600080fd5b6142e8846142a1565b9250602084013591506142fd604085016142a1565b90509250925092565b60006020828403121561431857600080fd5b610b69826142a1565b803567ffffffffffffffff811681146142c557600080fd5b60008083601f84011261434b57600080fd5b50813567ffffffffffffffff81111561436357600080fd5b6020830191508360208260051b85010111156122bb57600080fd5b60008060008060006060868803121561439657600080fd5b61439f86614321565b9450602086013567ffffffffffffffff808211156143bc57600080fd5b6143c889838a01614339565b909650945060408801359150808211156143e157600080fd5b818801915088601f8301126143f557600080fd5b81358181111561440457600080fd5b8960208260061b850101111561441957600080fd5b9699959850939650602001949392505050565b6000815180845260005b8181101561445257602081850181015186830182015201614436565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b600060208083016020845280855180835260408601915060408160051b87010192506020870160005b82811015614505577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc08886030184526144f385835161442c565b945092850192908501906001016144b9565b5092979650505050505050565b602081526000610b69602083018461442c565b6020808252825182820181905260009190848201906040850190845b8181101561457357835173ffffffffffffffffffffffffffffffffffffffff1683529284019291840191600101614541565b50909695505050505050565b60006020828403121561459157600080fd5b813567ffffffffffffffff8111156145a857600080fd5b820160408185031215610b6957600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff8111828210171561460c5761460c6145ba565b60405290565b60405160a0810167ffffffffffffffff8111828210171561460c5761460c6145ba565b60405160c0810167ffffffffffffffff8111828210171561460c5761460c6145ba565b604051610200810167ffffffffffffffff8111828210171561460c5761460c6145ba565b6040516060810167ffffffffffffffff8111828210171561460c5761460c6145ba565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156146e6576146e66145ba565b604052919050565b600067ffffffffffffffff821115614708576147086145ba565b5060051b60200190565b60ff811681146111b957600080fd5b6000602080838503121561473457600080fd5b823567ffffffffffffffff81111561474b57600080fd5b8301601f8101851361475c57600080fd5b803561476f61476a826146ee565b61469f565b8181526060918202830184019184820191908884111561478e57600080fd5b938501935b8385101561482e57848903818112156147ac5760008081fd5b6147b46145e9565b6147bd876142a1565b81526040807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0840112156147f15760008081fd5b6147f96145e9565b92506148068989016142a1565b835287013561481481614712565b828901528088019190915283529384019391850191614793565b50979650505050505050565b80151581146111b957600080fd5b80356142c58161483a565b6000602080838503121561486657600080fd5b823567ffffffffffffffff81111561487d57600080fd5b8301601f8101851361488e57600080fd5b803561489c61476a826146ee565b81815260a091820283018401918482019190888411156148bb57600080fd5b938501935b8385101561482e5780858a0312156148d85760008081fd5b6148e0614612565b6148e9866142a1565b8152868601357fffffffffffffffffffff000000000000000000000000000000000000000000008116811461491e5760008081fd5b818801526040868101357fffff000000000000000000000000000000000000000000000000000000000000811681146149575760008081fd5b9082015260606149688782016142a1565b9082015260808681013561497b8161483a565b90820152835293840193918501916148c0565b600080602083850312156149a157600080fd5b823567ffffffffffffffff8111156149b857600080fd5b6149c485828601614339565b90969095509350505050565b602080825282518282018190526000919060409081850190868401855b82811015614a3e57614a2e84835180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16825260209081015163ffffffff16910152565b92840192908501906001016149ed565b5091979650505050505050565b600060208284031215614a5d57600080fd5b610b6982614321565b81517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16815260208083015163ffffffff1690820152604081016112c3565b81511515815261020081016020830151614ac1602084018261ffff169052565b506040830151614ad9604084018263ffffffff169052565b506060830151614af1606084018263ffffffff169052565b506080830151614b09608084018263ffffffff169052565b5060a0830151614b1f60a084018261ffff169052565b5060c0830151614b3760c084018263ffffffff169052565b5060e0830151614b4d60e084018261ffff169052565b506101008381015161ffff9081169184019190915261012080850151909116908301526101408084015163ffffffff90811691840191909152610160808501518216908401526101808085015167ffffffffffffffff16908401526101a080850151909116908301526101c0808401511515908301526101e0808401517fffffffff000000000000000000000000000000000000000000000000000000008116828501525b505092915050565b803563ffffffff811681146142c557600080fd5b803561ffff811681146142c557600080fd5b600082601f830112614c3157600080fd5b81356020614c4161476a836146ee565b82815260069290921b84018101918181019086841115614c6057600080fd5b8286015b84811015614cad5760408189031215614c7d5760008081fd5b614c856145e9565b614c8e82614321565b8152614c9b8583016142a1565b81860152835291830191604001614c64565b509695505050505050565b60008060408385031215614ccb57600080fd5b67ffffffffffffffff83351115614ce157600080fd5b83601f843585010112614cf357600080fd5b614d0361476a84358501356146ee565b8335840180358083526020808401939260059290921b90910101861015614d2957600080fd5b602085358601015b85358601803560051b01602001811015614f365767ffffffffffffffff81351115614d5b57600080fd5b8035863587010160407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0828a03011215614d9457600080fd5b614d9c6145e9565b614da860208301614321565b815267ffffffffffffffff60408301351115614dc357600080fd5b88603f604084013584010112614dd857600080fd5b614dee61476a60206040850135850101356146ee565b6020604084810135850182810135808552928401939260e00201018b1015614e1557600080fd5b6040808501358501015b6040858101358601602081013560e0020101811015614f175760e0818d031215614e4857600080fd5b614e506145e9565b614e59826142a1565b815260c07fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0838f03011215614e8d57600080fd5b614e95614635565b614ea160208401614bfa565b8152614eaf60408401614bfa565b6020820152614ec060608401614c0e565b6040820152614ed160808401614bfa565b6060820152614ee260a08401614bfa565b6080820152614ef460c084013561483a565b60c083013560a0820152602082810191909152908452929092019160e001614e1f565b5080602084015250508085525050602083019250602081019050614d31565b5092505067ffffffffffffffff60208401351115614f5357600080fd5b614f638460208501358501614c20565b90509250929050565b600082601f830112614f7d57600080fd5b81356020614f8d61476a836146ee565b8083825260208201915060208460051b870101935086841115614faf57600080fd5b602086015b84811015614cad57614fc5816142a1565b8352918301918301614fb4565b60008060408385031215614fe557600080fd5b823567ffffffffffffffff80821115614ffd57600080fd5b61500986838701614f6c565b9350602085013591508082111561501f57600080fd5b5061502c85828601614f6c565b9150509250929050565b60008083601f84011261504857600080fd5b50813567ffffffffffffffff81111561506057600080fd5b6020830191508360208285010111156122bb57600080fd5b6000806000806040858703121561508e57600080fd5b843567ffffffffffffffff808211156150a657600080fd5b6150b288838901615036565b909650945060208701359150808211156150cb57600080fd5b506150d887828801615036565b95989497509550505050565b600080604083850312156150f757600080fd5b61510083614321565b9150614f63602084016142a1565b60006020828403121561512057600080fd5b813567ffffffffffffffff8082111561513857600080fd5b908301906040828603121561514c57600080fd5b6151546145e9565b82358281111561516357600080fd5b61516f87828601614f6c565b82525060208301358281111561518457600080fd5b61519087828601614f6c565b60208301525095945050505050565b80357fffffffff00000000000000000000000000000000000000000000000000000000811681146142c557600080fd5b600060208083850312156151e257600080fd5b823567ffffffffffffffff8111156151f957600080fd5b8301601f8101851361520a57600080fd5b803561521861476a826146ee565b818152610220918202830184019184820191908884111561523857600080fd5b938501935b8385101561482e57848903818112156152565760008081fd5b61525e6145e9565b61526787614321565b8152610200807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08401121561529c5760008081fd5b6152a4614658565b92506152b1898901614848565b835260406152c0818a01614c0e565b8a85015260606152d1818b01614bfa565b82860152608091506152e4828b01614bfa565b9085015260a06152f58a8201614bfa565b8286015260c09150615308828b01614c0e565b9085015260e06153198a8201614bfa565b82860152610100915061532d828b01614c0e565b9085015261012061533f8a8201614c0e565b828601526101409150615353828b01614c0e565b908501526101606153658a8201614bfa565b828601526101809150615379828b01614bfa565b908501526101a061538b8a8201614321565b828601526101c0915061539f828b01614bfa565b908501526101e06153b18a8201614848565b828601526153c0838b0161519f565b908501525050808801919091528352938401939185019161523d565b600060208083850312156153ef57600080fd5b823567ffffffffffffffff81111561540657600080fd5b8301601f8101851361541757600080fd5b803561542561476a826146ee565b81815260069190911b8201830190838101908783111561544457600080fd5b928401925b8284101561549657604084890312156154625760008081fd5b61546a6145e9565b615473856142a1565b8152615480868601614321565b8187015282526040939093019290840190615449565b979650505050505050565b6000806000806000608086880312156154b957600080fd5b6154c286614321565b94506154d0602087016142a1565b935060408601359250606086013567ffffffffffffffff8111156154f357600080fd5b6154ff88828901615036565b969995985093965092949392505050565b8381528215156020820152606060408201526000612eda606083018461442c565b6000806040838503121561554457600080fd5b61554d83614321565b9150602083013567ffffffffffffffff81111561556957600080fd5b830160a0818603121561557b57600080fd5b809150509250929050565b6000806040838503121561559957600080fd5b6155a2836142a1565b9150614f6360208401614321565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b80820281158282048414176112c3576112c36155b0565b60008261562c577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6183360301811261569457600080fd5b9190910192915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126156d357600080fd5b83018035915067ffffffffffffffff8211156156ee57600080fd5b6020019150368190038213156122bb57600080fd5b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261573857600080fd5b83018035915067ffffffffffffffff82111561575357600080fd5b6020019150600681901b36038213156122bb57600080fd5b80357bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811681146142c557600080fd5b6000604082840312156157a957600080fd5b6157b16145e9565b6157ba836142a1565b81526157c86020840161576b565b60208201529392505050565b6000604082840312156157e657600080fd5b6157ee6145e9565b6157ba83614321565b6000602080838503121561580a57600080fd5b823567ffffffffffffffff81111561582157600080fd5b8301601f8101851361583257600080fd5b803561584061476a826146ee565b8181526060918202830184019184820191908884111561585f57600080fd5b938501935b8385101561482e5780858a03121561587c5760008081fd5b61588461467c565b61588d866142a1565b815261589a87870161576b565b8782015260406158ab818801614bfa565b9082015283529384019391850191615864565b808201808211156112c3576112c36155b0565b818103818111156112c3576112c36155b0565b60ff81811683821601908111156112c3576112c36155b0565b60ff82811682821603908111156112c3576112c36155b0565b600181815b8085111561596f57817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115615955576159556155b0565b8085161561596257918102915b93841c939080029061591b565b509250929050565b600082615986575060016112c3565b81615993575060006112c3565b81600181146159a957600281146159b3576159cf565b60019150506112c3565b60ff8411156159c4576159c46155b0565b50506001821b6112c3565b5060208310610133831016604e8410600b84101617156159f2575081810a6112c3565b6159fc8383615916565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115615a2e57615a2e6155b0565b029392505050565b6000610b6960ff841683615977565b7fffffffff000000000000000000000000000000000000000000000000000000008135818116916004851015614bf25760049490940360031b84901b1690921692915050565b60008085851115615a9b57600080fd5b83861115615aa857600080fd5b5050820193919092039150565b600060408284031215615ac757600080fd5b615acf6145e9565b8251815260208301516157c88161483a565b600060208284031215615af357600080fd5b5051919050565b805169ffffffffffffffffffff811681146142c557600080fd5b600080600080600060a08688031215615b2c57600080fd5b615b3586615afa565b9450602086015193506040860151925060608601519150615b5860808701615afa565b90509295509295909350565b600060208284031215615b7657600080fd5b8151610b6981614712565b600060408284031215615b9357600080fd5b615b9b6145e9565b615ba4836142a1565b8152602083013560208201528091505092915050565b63ffffffff818116838216019080821115614242576142426155b0565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfea164736f6c6343000818000a",
+}
+
+var FeeQuoterABI = FeeQuoterMetaData.ABI
+
+var FeeQuoterBin = FeeQuoterMetaData.Bin
+
+func DeployFeeQuoter(auth *bind.TransactOpts, backend bind.ContractBackend, staticConfig FeeQuoterStaticConfig, priceUpdaters []common.Address, feeTokens []common.Address, tokenPriceFeeds []FeeQuoterTokenPriceFeedUpdate, tokenTransferFeeConfigArgs []FeeQuoterTokenTransferFeeConfigArgs, premiumMultiplierWeiPerEthArgs []FeeQuoterPremiumMultiplierWeiPerEthArgs, destChainConfigArgs []FeeQuoterDestChainConfigArgs) (common.Address, *types.Transaction, *FeeQuoter, error) {
+	parsed, err := FeeQuoterMetaData.GetAbi()
+	if err != nil {
+		return common.Address{}, nil, nil, err
+	}
+	if parsed == nil {
+		return common.Address{}, nil, nil, errors.New("GetABI returned nil")
+	}
+
+	address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(FeeQuoterBin), backend, staticConfig, priceUpdaters, feeTokens, tokenPriceFeeds, tokenTransferFeeConfigArgs, premiumMultiplierWeiPerEthArgs, destChainConfigArgs)
+	if err != nil {
+		return common.Address{}, nil, nil, err
+	}
+	return address, tx, &FeeQuoter{address: address, abi: *parsed, FeeQuoterCaller: FeeQuoterCaller{contract: contract}, FeeQuoterTransactor: FeeQuoterTransactor{contract: contract}, FeeQuoterFilterer: FeeQuoterFilterer{contract: contract}}, nil
+}
+
+type FeeQuoter struct {
+	address common.Address
+	abi     abi.ABI
+	FeeQuoterCaller
+	FeeQuoterTransactor
+	FeeQuoterFilterer
+}
+
+type FeeQuoterCaller struct {
+	contract *bind.BoundContract
+}
+
+type FeeQuoterTransactor struct {
+	contract *bind.BoundContract
+}
+
+type FeeQuoterFilterer struct {
+	contract *bind.BoundContract
+}
+
+type FeeQuoterSession struct {
+	Contract     *FeeQuoter
+	CallOpts     bind.CallOpts
+	TransactOpts bind.TransactOpts
+}
+
+type FeeQuoterCallerSession struct {
+	Contract *FeeQuoterCaller
+	CallOpts bind.CallOpts
+}
+
+type FeeQuoterTransactorSession struct {
+	Contract     *FeeQuoterTransactor
+	TransactOpts bind.TransactOpts
+}
+
+type FeeQuoterRaw struct {
+	Contract *FeeQuoter
+}
+
+type FeeQuoterCallerRaw struct {
+	Contract *FeeQuoterCaller
+}
+
+type FeeQuoterTransactorRaw struct {
+	Contract *FeeQuoterTransactor
+}
+
+func NewFeeQuoter(address common.Address, backend bind.ContractBackend) (*FeeQuoter, error) {
+	abi, err := abi.JSON(strings.NewReader(FeeQuoterABI))
+	if err != nil {
+		return nil, err
+	}
+	contract, err := bindFeeQuoter(address, backend, backend, backend)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoter{address: address, abi: abi, FeeQuoterCaller: FeeQuoterCaller{contract: contract}, FeeQuoterTransactor: FeeQuoterTransactor{contract: contract}, FeeQuoterFilterer: FeeQuoterFilterer{contract: contract}}, nil
+}
+
+func NewFeeQuoterCaller(address common.Address, caller bind.ContractCaller) (*FeeQuoterCaller, error) {
+	contract, err := bindFeeQuoter(address, caller, nil, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterCaller{contract: contract}, nil
+}
+
+func NewFeeQuoterTransactor(address common.Address, transactor bind.ContractTransactor) (*FeeQuoterTransactor, error) {
+	contract, err := bindFeeQuoter(address, nil, transactor, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterTransactor{contract: contract}, nil
+}
+
+func NewFeeQuoterFilterer(address common.Address, filterer bind.ContractFilterer) (*FeeQuoterFilterer, error) {
+	contract, err := bindFeeQuoter(address, nil, nil, filterer)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterFilterer{contract: contract}, nil
+}
+
+func bindFeeQuoter(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
+	parsed, err := FeeQuoterMetaData.GetAbi()
+	if err != nil {
+		return nil, err
+	}
+	return bind.NewBoundContract(address, *parsed, caller, transactor, filterer), nil
+}
+
+func (_FeeQuoter *FeeQuoterRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
+	return _FeeQuoter.Contract.FeeQuoterCaller.contract.Call(opts, result, method, params...)
+}
+
+func (_FeeQuoter *FeeQuoterRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.FeeQuoterTransactor.contract.Transfer(opts)
+}
+
+func (_FeeQuoter *FeeQuoterRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.FeeQuoterTransactor.contract.Transact(opts, method, params...)
+}
+
+func (_FeeQuoter *FeeQuoterCallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
+	return _FeeQuoter.Contract.contract.Call(opts, result, method, params...)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.contract.Transfer(opts)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.contract.Transact(opts, method, params...)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) ConvertTokenAmount(opts *bind.CallOpts, fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address) (*big.Int, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "convertTokenAmount", fromToken, fromTokenAmount, toToken)
+
+	if err != nil {
+		return *new(*big.Int), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) ConvertTokenAmount(fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address) (*big.Int, error) {
+	return _FeeQuoter.Contract.ConvertTokenAmount(&_FeeQuoter.CallOpts, fromToken, fromTokenAmount, toToken)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) ConvertTokenAmount(fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address) (*big.Int, error) {
+	return _FeeQuoter.Contract.ConvertTokenAmount(&_FeeQuoter.CallOpts, fromToken, fromTokenAmount, toToken)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetAllAuthorizedCallers(opts *bind.CallOpts) ([]common.Address, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getAllAuthorizedCallers")
+
+	if err != nil {
+		return *new([]common.Address), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new([]common.Address)).(*[]common.Address)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetAllAuthorizedCallers() ([]common.Address, error) {
+	return _FeeQuoter.Contract.GetAllAuthorizedCallers(&_FeeQuoter.CallOpts)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetAllAuthorizedCallers() ([]common.Address, error) {
+	return _FeeQuoter.Contract.GetAllAuthorizedCallers(&_FeeQuoter.CallOpts)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetDestChainConfig(opts *bind.CallOpts, destChainSelector uint64) (FeeQuoterDestChainConfig, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getDestChainConfig", destChainSelector)
+
+	if err != nil {
+		return *new(FeeQuoterDestChainConfig), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(FeeQuoterDestChainConfig)).(*FeeQuoterDestChainConfig)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetDestChainConfig(destChainSelector uint64) (FeeQuoterDestChainConfig, error) {
+	return _FeeQuoter.Contract.GetDestChainConfig(&_FeeQuoter.CallOpts, destChainSelector)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetDestChainConfig(destChainSelector uint64) (FeeQuoterDestChainConfig, error) {
+	return _FeeQuoter.Contract.GetDestChainConfig(&_FeeQuoter.CallOpts, destChainSelector)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetDestinationChainGasPrice(opts *bind.CallOpts, destChainSelector uint64) (InternalTimestampedPackedUint224, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getDestinationChainGasPrice", destChainSelector)
+
+	if err != nil {
+		return *new(InternalTimestampedPackedUint224), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(InternalTimestampedPackedUint224)).(*InternalTimestampedPackedUint224)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetDestinationChainGasPrice(destChainSelector uint64) (InternalTimestampedPackedUint224, error) {
+	return _FeeQuoter.Contract.GetDestinationChainGasPrice(&_FeeQuoter.CallOpts, destChainSelector)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetDestinationChainGasPrice(destChainSelector uint64) (InternalTimestampedPackedUint224, error) {
+	return _FeeQuoter.Contract.GetDestinationChainGasPrice(&_FeeQuoter.CallOpts, destChainSelector)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetFeeTokens(opts *bind.CallOpts) ([]common.Address, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getFeeTokens")
+
+	if err != nil {
+		return *new([]common.Address), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new([]common.Address)).(*[]common.Address)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetFeeTokens() ([]common.Address, error) {
+	return _FeeQuoter.Contract.GetFeeTokens(&_FeeQuoter.CallOpts)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetFeeTokens() ([]common.Address, error) {
+	return _FeeQuoter.Contract.GetFeeTokens(&_FeeQuoter.CallOpts)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetPremiumMultiplierWeiPerEth(opts *bind.CallOpts, token common.Address) (uint64, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getPremiumMultiplierWeiPerEth", token)
+
+	if err != nil {
+		return *new(uint64), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetPremiumMultiplierWeiPerEth(token common.Address) (uint64, error) {
+	return _FeeQuoter.Contract.GetPremiumMultiplierWeiPerEth(&_FeeQuoter.CallOpts, token)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetPremiumMultiplierWeiPerEth(token common.Address) (uint64, error) {
+	return _FeeQuoter.Contract.GetPremiumMultiplierWeiPerEth(&_FeeQuoter.CallOpts, token)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetStaticConfig(opts *bind.CallOpts) (FeeQuoterStaticConfig, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getStaticConfig")
+
+	if err != nil {
+		return *new(FeeQuoterStaticConfig), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(FeeQuoterStaticConfig)).(*FeeQuoterStaticConfig)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetStaticConfig() (FeeQuoterStaticConfig, error) {
+	return _FeeQuoter.Contract.GetStaticConfig(&_FeeQuoter.CallOpts)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetStaticConfig() (FeeQuoterStaticConfig, error) {
+	return _FeeQuoter.Contract.GetStaticConfig(&_FeeQuoter.CallOpts)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetTokenAndGasPrices(opts *bind.CallOpts, token common.Address, destChainSelector uint64) (GetTokenAndGasPrices,
+
+	error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getTokenAndGasPrices", token, destChainSelector)
+
+	outstruct := new(GetTokenAndGasPrices)
+	if err != nil {
+		return *outstruct, err
+	}
+
+	outstruct.TokenPrice = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
+	outstruct.GasPriceValue = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
+
+	return *outstruct, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetTokenAndGasPrices(token common.Address, destChainSelector uint64) (GetTokenAndGasPrices,
+
+	error) {
+	return _FeeQuoter.Contract.GetTokenAndGasPrices(&_FeeQuoter.CallOpts, token, destChainSelector)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetTokenAndGasPrices(token common.Address, destChainSelector uint64) (GetTokenAndGasPrices,
+
+	error) {
+	return _FeeQuoter.Contract.GetTokenAndGasPrices(&_FeeQuoter.CallOpts, token, destChainSelector)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetTokenPrice(opts *bind.CallOpts, token common.Address) (InternalTimestampedPackedUint224, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getTokenPrice", token)
+
+	if err != nil {
+		return *new(InternalTimestampedPackedUint224), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(InternalTimestampedPackedUint224)).(*InternalTimestampedPackedUint224)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetTokenPrice(token common.Address) (InternalTimestampedPackedUint224, error) {
+	return _FeeQuoter.Contract.GetTokenPrice(&_FeeQuoter.CallOpts, token)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetTokenPrice(token common.Address) (InternalTimestampedPackedUint224, error) {
+	return _FeeQuoter.Contract.GetTokenPrice(&_FeeQuoter.CallOpts, token)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetTokenPriceFeedConfig(opts *bind.CallOpts, token common.Address) (IFeeQuoterTokenPriceFeedConfig, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getTokenPriceFeedConfig", token)
+
+	if err != nil {
+		return *new(IFeeQuoterTokenPriceFeedConfig), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(IFeeQuoterTokenPriceFeedConfig)).(*IFeeQuoterTokenPriceFeedConfig)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetTokenPriceFeedConfig(token common.Address) (IFeeQuoterTokenPriceFeedConfig, error) {
+	return _FeeQuoter.Contract.GetTokenPriceFeedConfig(&_FeeQuoter.CallOpts, token)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetTokenPriceFeedConfig(token common.Address) (IFeeQuoterTokenPriceFeedConfig, error) {
+	return _FeeQuoter.Contract.GetTokenPriceFeedConfig(&_FeeQuoter.CallOpts, token)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetTokenPrices(opts *bind.CallOpts, tokens []common.Address) ([]InternalTimestampedPackedUint224, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getTokenPrices", tokens)
+
+	if err != nil {
+		return *new([]InternalTimestampedPackedUint224), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new([]InternalTimestampedPackedUint224)).(*[]InternalTimestampedPackedUint224)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetTokenPrices(tokens []common.Address) ([]InternalTimestampedPackedUint224, error) {
+	return _FeeQuoter.Contract.GetTokenPrices(&_FeeQuoter.CallOpts, tokens)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetTokenPrices(tokens []common.Address) ([]InternalTimestampedPackedUint224, error) {
+	return _FeeQuoter.Contract.GetTokenPrices(&_FeeQuoter.CallOpts, tokens)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetTokenTransferFeeConfig(opts *bind.CallOpts, destChainSelector uint64, token common.Address) (FeeQuoterTokenTransferFeeConfig, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getTokenTransferFeeConfig", destChainSelector, token)
+
+	if err != nil {
+		return *new(FeeQuoterTokenTransferFeeConfig), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(FeeQuoterTokenTransferFeeConfig)).(*FeeQuoterTokenTransferFeeConfig)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetTokenTransferFeeConfig(destChainSelector uint64, token common.Address) (FeeQuoterTokenTransferFeeConfig, error) {
+	return _FeeQuoter.Contract.GetTokenTransferFeeConfig(&_FeeQuoter.CallOpts, destChainSelector, token)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetTokenTransferFeeConfig(destChainSelector uint64, token common.Address) (FeeQuoterTokenTransferFeeConfig, error) {
+	return _FeeQuoter.Contract.GetTokenTransferFeeConfig(&_FeeQuoter.CallOpts, destChainSelector, token)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetValidatedFee(opts *bind.CallOpts, destChainSelector uint64, message ClientEVM2AnyMessage) (*big.Int, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getValidatedFee", destChainSelector, message)
+
+	if err != nil {
+		return *new(*big.Int), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetValidatedFee(destChainSelector uint64, message ClientEVM2AnyMessage) (*big.Int, error) {
+	return _FeeQuoter.Contract.GetValidatedFee(&_FeeQuoter.CallOpts, destChainSelector, message)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetValidatedFee(destChainSelector uint64, message ClientEVM2AnyMessage) (*big.Int, error) {
+	return _FeeQuoter.Contract.GetValidatedFee(&_FeeQuoter.CallOpts, destChainSelector, message)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) GetValidatedTokenPrice(opts *bind.CallOpts, token common.Address) (*big.Int, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "getValidatedTokenPrice", token)
+
+	if err != nil {
+		return *new(*big.Int), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) GetValidatedTokenPrice(token common.Address) (*big.Int, error) {
+	return _FeeQuoter.Contract.GetValidatedTokenPrice(&_FeeQuoter.CallOpts, token)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) GetValidatedTokenPrice(token common.Address) (*big.Int, error) {
+	return _FeeQuoter.Contract.GetValidatedTokenPrice(&_FeeQuoter.CallOpts, token)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) Owner(opts *bind.CallOpts) (common.Address, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "owner")
+
+	if err != nil {
+		return *new(common.Address), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) Owner() (common.Address, error) {
+	return _FeeQuoter.Contract.Owner(&_FeeQuoter.CallOpts)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) Owner() (common.Address, error) {
+	return _FeeQuoter.Contract.Owner(&_FeeQuoter.CallOpts)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) ProcessMessageArgs(opts *bind.CallOpts, destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte) (ProcessMessageArgs,
+
+	error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "processMessageArgs", destChainSelector, feeToken, feeTokenAmount, extraArgs)
+
+	outstruct := new(ProcessMessageArgs)
+	if err != nil {
+		return *outstruct, err
+	}
+
+	outstruct.MsgFeeJuels = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
+	outstruct.IsOutOfOrderExecution = *abi.ConvertType(out[1], new(bool)).(*bool)
+	outstruct.ConvertedExtraArgs = *abi.ConvertType(out[2], new([]byte)).(*[]byte)
+
+	return *outstruct, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) ProcessMessageArgs(destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte) (ProcessMessageArgs,
+
+	error) {
+	return _FeeQuoter.Contract.ProcessMessageArgs(&_FeeQuoter.CallOpts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) ProcessMessageArgs(destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte) (ProcessMessageArgs,
+
+	error) {
+	return _FeeQuoter.Contract.ProcessMessageArgs(&_FeeQuoter.CallOpts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) ProcessPoolReturnData(opts *bind.CallOpts, destChainSelector uint64, rampTokenAmounts []InternalRampTokenAmount, sourceTokenAmounts []ClientEVMTokenAmount) ([][]byte, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "processPoolReturnData", destChainSelector, rampTokenAmounts, sourceTokenAmounts)
+
+	if err != nil {
+		return *new([][]byte), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new([][]byte)).(*[][]byte)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) ProcessPoolReturnData(destChainSelector uint64, rampTokenAmounts []InternalRampTokenAmount, sourceTokenAmounts []ClientEVMTokenAmount) ([][]byte, error) {
+	return _FeeQuoter.Contract.ProcessPoolReturnData(&_FeeQuoter.CallOpts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) ProcessPoolReturnData(destChainSelector uint64, rampTokenAmounts []InternalRampTokenAmount, sourceTokenAmounts []ClientEVMTokenAmount) ([][]byte, error) {
+	return _FeeQuoter.Contract.ProcessPoolReturnData(&_FeeQuoter.CallOpts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)
+}
+
+func (_FeeQuoter *FeeQuoterCaller) TypeAndVersion(opts *bind.CallOpts) (string, error) {
+	var out []interface{}
+	err := _FeeQuoter.contract.Call(opts, &out, "typeAndVersion")
+
+	if err != nil {
+		return *new(string), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(string)).(*string)
+
+	return out0, err
+
+}
+
+func (_FeeQuoter *FeeQuoterSession) TypeAndVersion() (string, error) {
+	return _FeeQuoter.Contract.TypeAndVersion(&_FeeQuoter.CallOpts)
+}
+
+func (_FeeQuoter *FeeQuoterCallerSession) TypeAndVersion() (string, error) {
+	return _FeeQuoter.Contract.TypeAndVersion(&_FeeQuoter.CallOpts)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "acceptOwnership")
+}
+
+func (_FeeQuoter *FeeQuoterSession) AcceptOwnership() (*types.Transaction, error) {
+	return _FeeQuoter.Contract.AcceptOwnership(&_FeeQuoter.TransactOpts)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) AcceptOwnership() (*types.Transaction, error) {
+	return _FeeQuoter.Contract.AcceptOwnership(&_FeeQuoter.TransactOpts)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) ApplyAuthorizedCallerUpdates(opts *bind.TransactOpts, authorizedCallerArgs AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "applyAuthorizedCallerUpdates", authorizedCallerArgs)
+}
+
+func (_FeeQuoter *FeeQuoterSession) ApplyAuthorizedCallerUpdates(authorizedCallerArgs AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.ApplyAuthorizedCallerUpdates(&_FeeQuoter.TransactOpts, authorizedCallerArgs)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) ApplyAuthorizedCallerUpdates(authorizedCallerArgs AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.ApplyAuthorizedCallerUpdates(&_FeeQuoter.TransactOpts, authorizedCallerArgs)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) ApplyDestChainConfigUpdates(opts *bind.TransactOpts, destChainConfigArgs []FeeQuoterDestChainConfigArgs) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "applyDestChainConfigUpdates", destChainConfigArgs)
+}
+
+func (_FeeQuoter *FeeQuoterSession) ApplyDestChainConfigUpdates(destChainConfigArgs []FeeQuoterDestChainConfigArgs) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.ApplyDestChainConfigUpdates(&_FeeQuoter.TransactOpts, destChainConfigArgs)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) ApplyDestChainConfigUpdates(destChainConfigArgs []FeeQuoterDestChainConfigArgs) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.ApplyDestChainConfigUpdates(&_FeeQuoter.TransactOpts, destChainConfigArgs)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) ApplyFeeTokensUpdates(opts *bind.TransactOpts, feeTokensToAdd []common.Address, feeTokensToRemove []common.Address) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "applyFeeTokensUpdates", feeTokensToAdd, feeTokensToRemove)
+}
+
+func (_FeeQuoter *FeeQuoterSession) ApplyFeeTokensUpdates(feeTokensToAdd []common.Address, feeTokensToRemove []common.Address) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.ApplyFeeTokensUpdates(&_FeeQuoter.TransactOpts, feeTokensToAdd, feeTokensToRemove)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) ApplyFeeTokensUpdates(feeTokensToAdd []common.Address, feeTokensToRemove []common.Address) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.ApplyFeeTokensUpdates(&_FeeQuoter.TransactOpts, feeTokensToAdd, feeTokensToRemove)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) ApplyPremiumMultiplierWeiPerEthUpdates(opts *bind.TransactOpts, premiumMultiplierWeiPerEthArgs []FeeQuoterPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "applyPremiumMultiplierWeiPerEthUpdates", premiumMultiplierWeiPerEthArgs)
+}
+
+func (_FeeQuoter *FeeQuoterSession) ApplyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs []FeeQuoterPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.ApplyPremiumMultiplierWeiPerEthUpdates(&_FeeQuoter.TransactOpts, premiumMultiplierWeiPerEthArgs)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) ApplyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs []FeeQuoterPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.ApplyPremiumMultiplierWeiPerEthUpdates(&_FeeQuoter.TransactOpts, premiumMultiplierWeiPerEthArgs)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) ApplyTokenTransferFeeConfigUpdates(opts *bind.TransactOpts, tokenTransferFeeConfigArgs []FeeQuoterTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []FeeQuoterTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "applyTokenTransferFeeConfigUpdates", tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
+}
+
+func (_FeeQuoter *FeeQuoterSession) ApplyTokenTransferFeeConfigUpdates(tokenTransferFeeConfigArgs []FeeQuoterTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []FeeQuoterTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.ApplyTokenTransferFeeConfigUpdates(&_FeeQuoter.TransactOpts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) ApplyTokenTransferFeeConfigUpdates(tokenTransferFeeConfigArgs []FeeQuoterTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []FeeQuoterTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.ApplyTokenTransferFeeConfigUpdates(&_FeeQuoter.TransactOpts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) OnReport(opts *bind.TransactOpts, metadata []byte, report []byte) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "onReport", metadata, report)
+}
+
+func (_FeeQuoter *FeeQuoterSession) OnReport(metadata []byte, report []byte) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.OnReport(&_FeeQuoter.TransactOpts, metadata, report)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) OnReport(metadata []byte, report []byte) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.OnReport(&_FeeQuoter.TransactOpts, metadata, report)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) SetReportPermissions(opts *bind.TransactOpts, permissions []KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "setReportPermissions", permissions)
+}
+
+func (_FeeQuoter *FeeQuoterSession) SetReportPermissions(permissions []KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.SetReportPermissions(&_FeeQuoter.TransactOpts, permissions)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) SetReportPermissions(permissions []KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.SetReportPermissions(&_FeeQuoter.TransactOpts, permissions)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "transferOwnership", to)
+}
+
+func (_FeeQuoter *FeeQuoterSession) TransferOwnership(to common.Address) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.TransferOwnership(&_FeeQuoter.TransactOpts, to)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) TransferOwnership(to common.Address) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.TransferOwnership(&_FeeQuoter.TransactOpts, to)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) UpdatePrices(opts *bind.TransactOpts, priceUpdates InternalPriceUpdates) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "updatePrices", priceUpdates)
+}
+
+func (_FeeQuoter *FeeQuoterSession) UpdatePrices(priceUpdates InternalPriceUpdates) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.UpdatePrices(&_FeeQuoter.TransactOpts, priceUpdates)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) UpdatePrices(priceUpdates InternalPriceUpdates) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.UpdatePrices(&_FeeQuoter.TransactOpts, priceUpdates)
+}
+
+func (_FeeQuoter *FeeQuoterTransactor) UpdateTokenPriceFeeds(opts *bind.TransactOpts, tokenPriceFeedUpdates []FeeQuoterTokenPriceFeedUpdate) (*types.Transaction, error) {
+	return _FeeQuoter.contract.Transact(opts, "updateTokenPriceFeeds", tokenPriceFeedUpdates)
+}
+
+func (_FeeQuoter *FeeQuoterSession) UpdateTokenPriceFeeds(tokenPriceFeedUpdates []FeeQuoterTokenPriceFeedUpdate) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.UpdateTokenPriceFeeds(&_FeeQuoter.TransactOpts, tokenPriceFeedUpdates)
+}
+
+func (_FeeQuoter *FeeQuoterTransactorSession) UpdateTokenPriceFeeds(tokenPriceFeedUpdates []FeeQuoterTokenPriceFeedUpdate) (*types.Transaction, error) {
+	return _FeeQuoter.Contract.UpdateTokenPriceFeeds(&_FeeQuoter.TransactOpts, tokenPriceFeedUpdates)
+}
+
+type FeeQuoterAuthorizedCallerAddedIterator struct {
+	Event *FeeQuoterAuthorizedCallerAdded
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterAuthorizedCallerAddedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterAuthorizedCallerAdded)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterAuthorizedCallerAdded)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterAuthorizedCallerAddedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterAuthorizedCallerAddedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterAuthorizedCallerAdded struct {
+	Caller common.Address
+	Raw    types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterAuthorizedCallerAdded(opts *bind.FilterOpts) (*FeeQuoterAuthorizedCallerAddedIterator, error) {
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "AuthorizedCallerAdded")
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterAuthorizedCallerAddedIterator{contract: _FeeQuoter.contract, event: "AuthorizedCallerAdded", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchAuthorizedCallerAdded(opts *bind.WatchOpts, sink chan<- *FeeQuoterAuthorizedCallerAdded) (event.Subscription, error) {
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "AuthorizedCallerAdded")
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterAuthorizedCallerAdded)
+				if err := _FeeQuoter.contract.UnpackLog(event, "AuthorizedCallerAdded", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseAuthorizedCallerAdded(log types.Log) (*FeeQuoterAuthorizedCallerAdded, error) {
+	event := new(FeeQuoterAuthorizedCallerAdded)
+	if err := _FeeQuoter.contract.UnpackLog(event, "AuthorizedCallerAdded", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterAuthorizedCallerRemovedIterator struct {
+	Event *FeeQuoterAuthorizedCallerRemoved
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterAuthorizedCallerRemovedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterAuthorizedCallerRemoved)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterAuthorizedCallerRemoved)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterAuthorizedCallerRemovedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterAuthorizedCallerRemovedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterAuthorizedCallerRemoved struct {
+	Caller common.Address
+	Raw    types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterAuthorizedCallerRemoved(opts *bind.FilterOpts) (*FeeQuoterAuthorizedCallerRemovedIterator, error) {
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "AuthorizedCallerRemoved")
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterAuthorizedCallerRemovedIterator{contract: _FeeQuoter.contract, event: "AuthorizedCallerRemoved", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchAuthorizedCallerRemoved(opts *bind.WatchOpts, sink chan<- *FeeQuoterAuthorizedCallerRemoved) (event.Subscription, error) {
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "AuthorizedCallerRemoved")
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterAuthorizedCallerRemoved)
+				if err := _FeeQuoter.contract.UnpackLog(event, "AuthorizedCallerRemoved", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseAuthorizedCallerRemoved(log types.Log) (*FeeQuoterAuthorizedCallerRemoved, error) {
+	event := new(FeeQuoterAuthorizedCallerRemoved)
+	if err := _FeeQuoter.contract.UnpackLog(event, "AuthorizedCallerRemoved", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterDestChainAddedIterator struct {
+	Event *FeeQuoterDestChainAdded
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterDestChainAddedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterDestChainAdded)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterDestChainAdded)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterDestChainAddedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterDestChainAddedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterDestChainAdded struct {
+	DestChainSelector uint64
+	DestChainConfig   FeeQuoterDestChainConfig
+	Raw               types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterDestChainAdded(opts *bind.FilterOpts, destChainSelector []uint64) (*FeeQuoterDestChainAddedIterator, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "DestChainAdded", destChainSelectorRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterDestChainAddedIterator{contract: _FeeQuoter.contract, event: "DestChainAdded", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchDestChainAdded(opts *bind.WatchOpts, sink chan<- *FeeQuoterDestChainAdded, destChainSelector []uint64) (event.Subscription, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "DestChainAdded", destChainSelectorRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterDestChainAdded)
+				if err := _FeeQuoter.contract.UnpackLog(event, "DestChainAdded", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseDestChainAdded(log types.Log) (*FeeQuoterDestChainAdded, error) {
+	event := new(FeeQuoterDestChainAdded)
+	if err := _FeeQuoter.contract.UnpackLog(event, "DestChainAdded", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterDestChainConfigUpdatedIterator struct {
+	Event *FeeQuoterDestChainConfigUpdated
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterDestChainConfigUpdatedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterDestChainConfigUpdated)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterDestChainConfigUpdated)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterDestChainConfigUpdatedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterDestChainConfigUpdatedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterDestChainConfigUpdated struct {
+	DestChainSelector uint64
+	DestChainConfig   FeeQuoterDestChainConfig
+	Raw               types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterDestChainConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64) (*FeeQuoterDestChainConfigUpdatedIterator, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "DestChainConfigUpdated", destChainSelectorRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterDestChainConfigUpdatedIterator{contract: _FeeQuoter.contract, event: "DestChainConfigUpdated", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchDestChainConfigUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterDestChainConfigUpdated, destChainSelector []uint64) (event.Subscription, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "DestChainConfigUpdated", destChainSelectorRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterDestChainConfigUpdated)
+				if err := _FeeQuoter.contract.UnpackLog(event, "DestChainConfigUpdated", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseDestChainConfigUpdated(log types.Log) (*FeeQuoterDestChainConfigUpdated, error) {
+	event := new(FeeQuoterDestChainConfigUpdated)
+	if err := _FeeQuoter.contract.UnpackLog(event, "DestChainConfigUpdated", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterFeeTokenAddedIterator struct {
+	Event *FeeQuoterFeeTokenAdded
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterFeeTokenAddedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterFeeTokenAdded)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterFeeTokenAdded)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterFeeTokenAddedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterFeeTokenAddedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterFeeTokenAdded struct {
+	FeeToken common.Address
+	Raw      types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterFeeTokenAdded(opts *bind.FilterOpts, feeToken []common.Address) (*FeeQuoterFeeTokenAddedIterator, error) {
+
+	var feeTokenRule []interface{}
+	for _, feeTokenItem := range feeToken {
+		feeTokenRule = append(feeTokenRule, feeTokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "FeeTokenAdded", feeTokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterFeeTokenAddedIterator{contract: _FeeQuoter.contract, event: "FeeTokenAdded", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchFeeTokenAdded(opts *bind.WatchOpts, sink chan<- *FeeQuoterFeeTokenAdded, feeToken []common.Address) (event.Subscription, error) {
+
+	var feeTokenRule []interface{}
+	for _, feeTokenItem := range feeToken {
+		feeTokenRule = append(feeTokenRule, feeTokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "FeeTokenAdded", feeTokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterFeeTokenAdded)
+				if err := _FeeQuoter.contract.UnpackLog(event, "FeeTokenAdded", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseFeeTokenAdded(log types.Log) (*FeeQuoterFeeTokenAdded, error) {
+	event := new(FeeQuoterFeeTokenAdded)
+	if err := _FeeQuoter.contract.UnpackLog(event, "FeeTokenAdded", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterFeeTokenRemovedIterator struct {
+	Event *FeeQuoterFeeTokenRemoved
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterFeeTokenRemovedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterFeeTokenRemoved)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterFeeTokenRemoved)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterFeeTokenRemovedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterFeeTokenRemovedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterFeeTokenRemoved struct {
+	FeeToken common.Address
+	Raw      types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterFeeTokenRemoved(opts *bind.FilterOpts, feeToken []common.Address) (*FeeQuoterFeeTokenRemovedIterator, error) {
+
+	var feeTokenRule []interface{}
+	for _, feeTokenItem := range feeToken {
+		feeTokenRule = append(feeTokenRule, feeTokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "FeeTokenRemoved", feeTokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterFeeTokenRemovedIterator{contract: _FeeQuoter.contract, event: "FeeTokenRemoved", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchFeeTokenRemoved(opts *bind.WatchOpts, sink chan<- *FeeQuoterFeeTokenRemoved, feeToken []common.Address) (event.Subscription, error) {
+
+	var feeTokenRule []interface{}
+	for _, feeTokenItem := range feeToken {
+		feeTokenRule = append(feeTokenRule, feeTokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "FeeTokenRemoved", feeTokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterFeeTokenRemoved)
+				if err := _FeeQuoter.contract.UnpackLog(event, "FeeTokenRemoved", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseFeeTokenRemoved(log types.Log) (*FeeQuoterFeeTokenRemoved, error) {
+	event := new(FeeQuoterFeeTokenRemoved)
+	if err := _FeeQuoter.contract.UnpackLog(event, "FeeTokenRemoved", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterOwnershipTransferRequestedIterator struct {
+	Event *FeeQuoterOwnershipTransferRequested
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterOwnershipTransferRequestedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterOwnershipTransferRequested)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterOwnershipTransferRequested)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterOwnershipTransferRequestedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterOwnershipTransferRequestedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterOwnershipTransferRequested struct {
+	From common.Address
+	To   common.Address
+	Raw  types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*FeeQuoterOwnershipTransferRequestedIterator, error) {
+
+	var fromRule []interface{}
+	for _, fromItem := range from {
+		fromRule = append(fromRule, fromItem)
+	}
+	var toRule []interface{}
+	for _, toItem := range to {
+		toRule = append(toRule, toItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "OwnershipTransferRequested", fromRule, toRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterOwnershipTransferRequestedIterator{contract: _FeeQuoter.contract, event: "OwnershipTransferRequested", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *FeeQuoterOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
+
+	var fromRule []interface{}
+	for _, fromItem := range from {
+		fromRule = append(fromRule, fromItem)
+	}
+	var toRule []interface{}
+	for _, toItem := range to {
+		toRule = append(toRule, toItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "OwnershipTransferRequested", fromRule, toRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterOwnershipTransferRequested)
+				if err := _FeeQuoter.contract.UnpackLog(event, "OwnershipTransferRequested", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseOwnershipTransferRequested(log types.Log) (*FeeQuoterOwnershipTransferRequested, error) {
+	event := new(FeeQuoterOwnershipTransferRequested)
+	if err := _FeeQuoter.contract.UnpackLog(event, "OwnershipTransferRequested", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterOwnershipTransferredIterator struct {
+	Event *FeeQuoterOwnershipTransferred
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterOwnershipTransferredIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterOwnershipTransferred)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterOwnershipTransferred)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterOwnershipTransferredIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterOwnershipTransferredIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterOwnershipTransferred struct {
+	From common.Address
+	To   common.Address
+	Raw  types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*FeeQuoterOwnershipTransferredIterator, error) {
+
+	var fromRule []interface{}
+	for _, fromItem := range from {
+		fromRule = append(fromRule, fromItem)
+	}
+	var toRule []interface{}
+	for _, toItem := range to {
+		toRule = append(toRule, toItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "OwnershipTransferred", fromRule, toRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterOwnershipTransferredIterator{contract: _FeeQuoter.contract, event: "OwnershipTransferred", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *FeeQuoterOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
+
+	var fromRule []interface{}
+	for _, fromItem := range from {
+		fromRule = append(fromRule, fromItem)
+	}
+	var toRule []interface{}
+	for _, toItem := range to {
+		toRule = append(toRule, toItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "OwnershipTransferred", fromRule, toRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterOwnershipTransferred)
+				if err := _FeeQuoter.contract.UnpackLog(event, "OwnershipTransferred", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseOwnershipTransferred(log types.Log) (*FeeQuoterOwnershipTransferred, error) {
+	event := new(FeeQuoterOwnershipTransferred)
+	if err := _FeeQuoter.contract.UnpackLog(event, "OwnershipTransferred", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator struct {
+	Event *FeeQuoterPremiumMultiplierWeiPerEthUpdated
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterPremiumMultiplierWeiPerEthUpdated)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterPremiumMultiplierWeiPerEthUpdated)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterPremiumMultiplierWeiPerEthUpdated struct {
+	Token                      common.Address
+	PremiumMultiplierWeiPerEth uint64
+	Raw                        types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterPremiumMultiplierWeiPerEthUpdated(opts *bind.FilterOpts, token []common.Address) (*FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator, error) {
+
+	var tokenRule []interface{}
+	for _, tokenItem := range token {
+		tokenRule = append(tokenRule, tokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "PremiumMultiplierWeiPerEthUpdated", tokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator{contract: _FeeQuoter.contract, event: "PremiumMultiplierWeiPerEthUpdated", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchPremiumMultiplierWeiPerEthUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterPremiumMultiplierWeiPerEthUpdated, token []common.Address) (event.Subscription, error) {
+
+	var tokenRule []interface{}
+	for _, tokenItem := range token {
+		tokenRule = append(tokenRule, tokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "PremiumMultiplierWeiPerEthUpdated", tokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterPremiumMultiplierWeiPerEthUpdated)
+				if err := _FeeQuoter.contract.UnpackLog(event, "PremiumMultiplierWeiPerEthUpdated", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParsePremiumMultiplierWeiPerEthUpdated(log types.Log) (*FeeQuoterPremiumMultiplierWeiPerEthUpdated, error) {
+	event := new(FeeQuoterPremiumMultiplierWeiPerEthUpdated)
+	if err := _FeeQuoter.contract.UnpackLog(event, "PremiumMultiplierWeiPerEthUpdated", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterPriceFeedPerTokenUpdatedIterator struct {
+	Event *FeeQuoterPriceFeedPerTokenUpdated
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterPriceFeedPerTokenUpdatedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterPriceFeedPerTokenUpdated)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterPriceFeedPerTokenUpdated)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterPriceFeedPerTokenUpdatedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterPriceFeedPerTokenUpdatedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterPriceFeedPerTokenUpdated struct {
+	Token           common.Address
+	PriceFeedConfig IFeeQuoterTokenPriceFeedConfig
+	Raw             types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterPriceFeedPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*FeeQuoterPriceFeedPerTokenUpdatedIterator, error) {
+
+	var tokenRule []interface{}
+	for _, tokenItem := range token {
+		tokenRule = append(tokenRule, tokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "PriceFeedPerTokenUpdated", tokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterPriceFeedPerTokenUpdatedIterator{contract: _FeeQuoter.contract, event: "PriceFeedPerTokenUpdated", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchPriceFeedPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterPriceFeedPerTokenUpdated, token []common.Address) (event.Subscription, error) {
+
+	var tokenRule []interface{}
+	for _, tokenItem := range token {
+		tokenRule = append(tokenRule, tokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "PriceFeedPerTokenUpdated", tokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterPriceFeedPerTokenUpdated)
+				if err := _FeeQuoter.contract.UnpackLog(event, "PriceFeedPerTokenUpdated", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParsePriceFeedPerTokenUpdated(log types.Log) (*FeeQuoterPriceFeedPerTokenUpdated, error) {
+	event := new(FeeQuoterPriceFeedPerTokenUpdated)
+	if err := _FeeQuoter.contract.UnpackLog(event, "PriceFeedPerTokenUpdated", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterReportPermissionSetIterator struct {
+	Event *FeeQuoterReportPermissionSet
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterReportPermissionSetIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterReportPermissionSet)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterReportPermissionSet)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterReportPermissionSetIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterReportPermissionSetIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterReportPermissionSet struct {
+	ReportId   [32]byte
+	Permission KeystoneFeedsPermissionHandlerPermission
+	Raw        types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterReportPermissionSet(opts *bind.FilterOpts, reportId [][32]byte) (*FeeQuoterReportPermissionSetIterator, error) {
+
+	var reportIdRule []interface{}
+	for _, reportIdItem := range reportId {
+		reportIdRule = append(reportIdRule, reportIdItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "ReportPermissionSet", reportIdRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterReportPermissionSetIterator{contract: _FeeQuoter.contract, event: "ReportPermissionSet", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchReportPermissionSet(opts *bind.WatchOpts, sink chan<- *FeeQuoterReportPermissionSet, reportId [][32]byte) (event.Subscription, error) {
+
+	var reportIdRule []interface{}
+	for _, reportIdItem := range reportId {
+		reportIdRule = append(reportIdRule, reportIdItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "ReportPermissionSet", reportIdRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterReportPermissionSet)
+				if err := _FeeQuoter.contract.UnpackLog(event, "ReportPermissionSet", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseReportPermissionSet(log types.Log) (*FeeQuoterReportPermissionSet, error) {
+	event := new(FeeQuoterReportPermissionSet)
+	if err := _FeeQuoter.contract.UnpackLog(event, "ReportPermissionSet", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterTokenTransferFeeConfigDeletedIterator struct {
+	Event *FeeQuoterTokenTransferFeeConfigDeleted
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterTokenTransferFeeConfigDeletedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterTokenTransferFeeConfigDeleted)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterTokenTransferFeeConfigDeleted)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterTokenTransferFeeConfigDeletedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterTokenTransferFeeConfigDeletedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterTokenTransferFeeConfigDeleted struct {
+	DestChainSelector uint64
+	Token             common.Address
+	Raw               types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterTokenTransferFeeConfigDeleted(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*FeeQuoterTokenTransferFeeConfigDeletedIterator, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+	var tokenRule []interface{}
+	for _, tokenItem := range token {
+		tokenRule = append(tokenRule, tokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "TokenTransferFeeConfigDeleted", destChainSelectorRule, tokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterTokenTransferFeeConfigDeletedIterator{contract: _FeeQuoter.contract, event: "TokenTransferFeeConfigDeleted", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchTokenTransferFeeConfigDeleted(opts *bind.WatchOpts, sink chan<- *FeeQuoterTokenTransferFeeConfigDeleted, destChainSelector []uint64, token []common.Address) (event.Subscription, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+	var tokenRule []interface{}
+	for _, tokenItem := range token {
+		tokenRule = append(tokenRule, tokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "TokenTransferFeeConfigDeleted", destChainSelectorRule, tokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterTokenTransferFeeConfigDeleted)
+				if err := _FeeQuoter.contract.UnpackLog(event, "TokenTransferFeeConfigDeleted", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseTokenTransferFeeConfigDeleted(log types.Log) (*FeeQuoterTokenTransferFeeConfigDeleted, error) {
+	event := new(FeeQuoterTokenTransferFeeConfigDeleted)
+	if err := _FeeQuoter.contract.UnpackLog(event, "TokenTransferFeeConfigDeleted", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterTokenTransferFeeConfigUpdatedIterator struct {
+	Event *FeeQuoterTokenTransferFeeConfigUpdated
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterTokenTransferFeeConfigUpdatedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterTokenTransferFeeConfigUpdated)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterTokenTransferFeeConfigUpdated)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterTokenTransferFeeConfigUpdatedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterTokenTransferFeeConfigUpdatedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterTokenTransferFeeConfigUpdated struct {
+	DestChainSelector      uint64
+	Token                  common.Address
+	TokenTransferFeeConfig FeeQuoterTokenTransferFeeConfig
+	Raw                    types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterTokenTransferFeeConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*FeeQuoterTokenTransferFeeConfigUpdatedIterator, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+	var tokenRule []interface{}
+	for _, tokenItem := range token {
+		tokenRule = append(tokenRule, tokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "TokenTransferFeeConfigUpdated", destChainSelectorRule, tokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterTokenTransferFeeConfigUpdatedIterator{contract: _FeeQuoter.contract, event: "TokenTransferFeeConfigUpdated", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchTokenTransferFeeConfigUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterTokenTransferFeeConfigUpdated, destChainSelector []uint64, token []common.Address) (event.Subscription, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+	var tokenRule []interface{}
+	for _, tokenItem := range token {
+		tokenRule = append(tokenRule, tokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "TokenTransferFeeConfigUpdated", destChainSelectorRule, tokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterTokenTransferFeeConfigUpdated)
+				if err := _FeeQuoter.contract.UnpackLog(event, "TokenTransferFeeConfigUpdated", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseTokenTransferFeeConfigUpdated(log types.Log) (*FeeQuoterTokenTransferFeeConfigUpdated, error) {
+	event := new(FeeQuoterTokenTransferFeeConfigUpdated)
+	if err := _FeeQuoter.contract.UnpackLog(event, "TokenTransferFeeConfigUpdated", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterUsdPerTokenUpdatedIterator struct {
+	Event *FeeQuoterUsdPerTokenUpdated
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterUsdPerTokenUpdatedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterUsdPerTokenUpdated)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterUsdPerTokenUpdated)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterUsdPerTokenUpdatedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterUsdPerTokenUpdatedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterUsdPerTokenUpdated struct {
+	Token     common.Address
+	Value     *big.Int
+	Timestamp *big.Int
+	Raw       types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterUsdPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*FeeQuoterUsdPerTokenUpdatedIterator, error) {
+
+	var tokenRule []interface{}
+	for _, tokenItem := range token {
+		tokenRule = append(tokenRule, tokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "UsdPerTokenUpdated", tokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterUsdPerTokenUpdatedIterator{contract: _FeeQuoter.contract, event: "UsdPerTokenUpdated", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchUsdPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterUsdPerTokenUpdated, token []common.Address) (event.Subscription, error) {
+
+	var tokenRule []interface{}
+	for _, tokenItem := range token {
+		tokenRule = append(tokenRule, tokenItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "UsdPerTokenUpdated", tokenRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterUsdPerTokenUpdated)
+				if err := _FeeQuoter.contract.UnpackLog(event, "UsdPerTokenUpdated", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseUsdPerTokenUpdated(log types.Log) (*FeeQuoterUsdPerTokenUpdated, error) {
+	event := new(FeeQuoterUsdPerTokenUpdated)
+	if err := _FeeQuoter.contract.UnpackLog(event, "UsdPerTokenUpdated", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type FeeQuoterUsdPerUnitGasUpdatedIterator struct {
+	Event *FeeQuoterUsdPerUnitGasUpdated
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *FeeQuoterUsdPerUnitGasUpdatedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(FeeQuoterUsdPerUnitGasUpdated)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(FeeQuoterUsdPerUnitGasUpdated)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *FeeQuoterUsdPerUnitGasUpdatedIterator) Error() error {
+	return it.fail
+}
+
+func (it *FeeQuoterUsdPerUnitGasUpdatedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type FeeQuoterUsdPerUnitGasUpdated struct {
+	DestChain uint64
+	Value     *big.Int
+	Timestamp *big.Int
+	Raw       types.Log
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) FilterUsdPerUnitGasUpdated(opts *bind.FilterOpts, destChain []uint64) (*FeeQuoterUsdPerUnitGasUpdatedIterator, error) {
+
+	var destChainRule []interface{}
+	for _, destChainItem := range destChain {
+		destChainRule = append(destChainRule, destChainItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.FilterLogs(opts, "UsdPerUnitGasUpdated", destChainRule)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeQuoterUsdPerUnitGasUpdatedIterator{contract: _FeeQuoter.contract, event: "UsdPerUnitGasUpdated", logs: logs, sub: sub}, nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) WatchUsdPerUnitGasUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterUsdPerUnitGasUpdated, destChain []uint64) (event.Subscription, error) {
+
+	var destChainRule []interface{}
+	for _, destChainItem := range destChain {
+		destChainRule = append(destChainRule, destChainItem)
+	}
+
+	logs, sub, err := _FeeQuoter.contract.WatchLogs(opts, "UsdPerUnitGasUpdated", destChainRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(FeeQuoterUsdPerUnitGasUpdated)
+				if err := _FeeQuoter.contract.UnpackLog(event, "UsdPerUnitGasUpdated", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_FeeQuoter *FeeQuoterFilterer) ParseUsdPerUnitGasUpdated(log types.Log) (*FeeQuoterUsdPerUnitGasUpdated, error) {
+	event := new(FeeQuoterUsdPerUnitGasUpdated)
+	if err := _FeeQuoter.contract.UnpackLog(event, "UsdPerUnitGasUpdated", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type GetTokenAndGasPrices struct {
+	TokenPrice    *big.Int
+	GasPriceValue *big.Int
+}
+type ProcessMessageArgs struct {
+	MsgFeeJuels           *big.Int
+	IsOutOfOrderExecution bool
+	ConvertedExtraArgs    []byte
+}
+
+func (_FeeQuoter *FeeQuoter) ParseLog(log types.Log) (generated.AbigenLog, error) {
+	switch log.Topics[0] {
+	case _FeeQuoter.abi.Events["AuthorizedCallerAdded"].ID:
+		return _FeeQuoter.ParseAuthorizedCallerAdded(log)
+	case _FeeQuoter.abi.Events["AuthorizedCallerRemoved"].ID:
+		return _FeeQuoter.ParseAuthorizedCallerRemoved(log)
+	case _FeeQuoter.abi.Events["DestChainAdded"].ID:
+		return _FeeQuoter.ParseDestChainAdded(log)
+	case _FeeQuoter.abi.Events["DestChainConfigUpdated"].ID:
+		return _FeeQuoter.ParseDestChainConfigUpdated(log)
+	case _FeeQuoter.abi.Events["FeeTokenAdded"].ID:
+		return _FeeQuoter.ParseFeeTokenAdded(log)
+	case _FeeQuoter.abi.Events["FeeTokenRemoved"].ID:
+		return _FeeQuoter.ParseFeeTokenRemoved(log)
+	case _FeeQuoter.abi.Events["OwnershipTransferRequested"].ID:
+		return _FeeQuoter.ParseOwnershipTransferRequested(log)
+	case _FeeQuoter.abi.Events["OwnershipTransferred"].ID:
+		return _FeeQuoter.ParseOwnershipTransferred(log)
+	case _FeeQuoter.abi.Events["PremiumMultiplierWeiPerEthUpdated"].ID:
+		return _FeeQuoter.ParsePremiumMultiplierWeiPerEthUpdated(log)
+	case _FeeQuoter.abi.Events["PriceFeedPerTokenUpdated"].ID:
+		return _FeeQuoter.ParsePriceFeedPerTokenUpdated(log)
+	case _FeeQuoter.abi.Events["ReportPermissionSet"].ID:
+		return _FeeQuoter.ParseReportPermissionSet(log)
+	case _FeeQuoter.abi.Events["TokenTransferFeeConfigDeleted"].ID:
+		return _FeeQuoter.ParseTokenTransferFeeConfigDeleted(log)
+	case _FeeQuoter.abi.Events["TokenTransferFeeConfigUpdated"].ID:
+		return _FeeQuoter.ParseTokenTransferFeeConfigUpdated(log)
+	case _FeeQuoter.abi.Events["UsdPerTokenUpdated"].ID:
+		return _FeeQuoter.ParseUsdPerTokenUpdated(log)
+	case _FeeQuoter.abi.Events["UsdPerUnitGasUpdated"].ID:
+		return _FeeQuoter.ParseUsdPerUnitGasUpdated(log)
+
+	default:
+		return nil, fmt.Errorf("abigen wrapper received unknown log topic: %v", log.Topics[0])
+	}
+}
+
+func (FeeQuoterAuthorizedCallerAdded) Topic() common.Hash {
+	return common.HexToHash("0xeb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef")
+}
+
+func (FeeQuoterAuthorizedCallerRemoved) Topic() common.Hash {
+	return common.HexToHash("0xc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda77580")
+}
+
+func (FeeQuoterDestChainAdded) Topic() common.Hash {
+	return common.HexToHash("0xd31c671936387b2f84ed402b553bd50c0e9c20408ea4e91a836d77b8180fb724")
+}
+
+func (FeeQuoterDestChainConfigUpdated) Topic() common.Hash {
+	return common.HexToHash("0x1edd6f3553cfa16f10b95b195abae3a1cfca4783de4843f95d674b1e1df5ab20")
+}
+
+func (FeeQuoterFeeTokenAdded) Topic() common.Hash {
+	return common.HexToHash("0xdf1b1bd32a69711488d71554706bb130b1fc63a5fa1a2cd85e8440f84065ba23")
+}
+
+func (FeeQuoterFeeTokenRemoved) Topic() common.Hash {
+	return common.HexToHash("0x1795838dc8ab2ffc5f431a1729a6afa0b587f982f7b2be0b9d7187a1ef547f91")
+}
+
+func (FeeQuoterOwnershipTransferRequested) Topic() common.Hash {
+	return common.HexToHash("0xed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae1278")
+}
+
+func (FeeQuoterOwnershipTransferred) Topic() common.Hash {
+	return common.HexToHash("0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0")
+}
+
+func (FeeQuoterPremiumMultiplierWeiPerEthUpdated) Topic() common.Hash {
+	return common.HexToHash("0xbb77da6f7210cdd16904228a9360133d1d7dfff99b1bc75f128da5b53e28f97d")
+}
+
+func (FeeQuoterPriceFeedPerTokenUpdated) Topic() common.Hash {
+	return common.HexToHash("0x08a5f7f5bb38a81d8e43aca13ecd76431dbf8816ae4699affff7b00b2fc1c464")
+}
+
+func (FeeQuoterReportPermissionSet) Topic() common.Hash {
+	return common.HexToHash("0x32a4ba3fa3351b11ad555d4c8ec70a744e8705607077a946807030d64b6ab1a3")
+}
+
+func (FeeQuoterTokenTransferFeeConfigDeleted) Topic() common.Hash {
+	return common.HexToHash("0x4de5b1bcbca6018c11303a2c3f4a4b4f22a1c741d8c4ba430d246ac06c5ddf8b")
+}
+
+func (FeeQuoterTokenTransferFeeConfigUpdated) Topic() common.Hash {
+	return common.HexToHash("0x94967ae9ea7729ad4f54021c1981765d2b1d954f7c92fbec340aa0a54f46b8b5")
+}
+
+func (FeeQuoterUsdPerTokenUpdated) Topic() common.Hash {
+	return common.HexToHash("0x52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a")
+}
+
+func (FeeQuoterUsdPerUnitGasUpdated) Topic() common.Hash {
+	return common.HexToHash("0xdd84a3fa9ef9409f550d54d6affec7e9c480c878c6ab27b78912a03e1b371c6e")
+}
+
+func (_FeeQuoter *FeeQuoter) Address() common.Address {
+	return _FeeQuoter.address
+}
+
+type FeeQuoterInterface interface {
+	ConvertTokenAmount(opts *bind.CallOpts, fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address) (*big.Int, error)
+
+	GetAllAuthorizedCallers(opts *bind.CallOpts) ([]common.Address, error)
+
+	GetDestChainConfig(opts *bind.CallOpts, destChainSelector uint64) (FeeQuoterDestChainConfig, error)
+
+	GetDestinationChainGasPrice(opts *bind.CallOpts, destChainSelector uint64) (InternalTimestampedPackedUint224, error)
+
+	GetFeeTokens(opts *bind.CallOpts) ([]common.Address, error)
+
+	GetPremiumMultiplierWeiPerEth(opts *bind.CallOpts, token common.Address) (uint64, error)
+
+	GetStaticConfig(opts *bind.CallOpts) (FeeQuoterStaticConfig, error)
+
+	GetTokenAndGasPrices(opts *bind.CallOpts, token common.Address, destChainSelector uint64) (GetTokenAndGasPrices,
+
+		error)
+
+	GetTokenPrice(opts *bind.CallOpts, token common.Address) (InternalTimestampedPackedUint224, error)
+
+	GetTokenPriceFeedConfig(opts *bind.CallOpts, token common.Address) (IFeeQuoterTokenPriceFeedConfig, error)
+
+	GetTokenPrices(opts *bind.CallOpts, tokens []common.Address) ([]InternalTimestampedPackedUint224, error)
+
+	GetTokenTransferFeeConfig(opts *bind.CallOpts, destChainSelector uint64, token common.Address) (FeeQuoterTokenTransferFeeConfig, error)
+
+	GetValidatedFee(opts *bind.CallOpts, destChainSelector uint64, message ClientEVM2AnyMessage) (*big.Int, error)
+
+	GetValidatedTokenPrice(opts *bind.CallOpts, token common.Address) (*big.Int, error)
+
+	Owner(opts *bind.CallOpts) (common.Address, error)
+
+	ProcessMessageArgs(opts *bind.CallOpts, destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte) (ProcessMessageArgs,
+
+		error)
+
+	ProcessPoolReturnData(opts *bind.CallOpts, destChainSelector uint64, rampTokenAmounts []InternalRampTokenAmount, sourceTokenAmounts []ClientEVMTokenAmount) ([][]byte, error)
+
+	TypeAndVersion(opts *bind.CallOpts) (string, error)
+
+	AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error)
+
+	ApplyAuthorizedCallerUpdates(opts *bind.TransactOpts, authorizedCallerArgs AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error)
+
+	ApplyDestChainConfigUpdates(opts *bind.TransactOpts, destChainConfigArgs []FeeQuoterDestChainConfigArgs) (*types.Transaction, error)
+
+	ApplyFeeTokensUpdates(opts *bind.TransactOpts, feeTokensToAdd []common.Address, feeTokensToRemove []common.Address) (*types.Transaction, error)
+
+	ApplyPremiumMultiplierWeiPerEthUpdates(opts *bind.TransactOpts, premiumMultiplierWeiPerEthArgs []FeeQuoterPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error)
+
+	ApplyTokenTransferFeeConfigUpdates(opts *bind.TransactOpts, tokenTransferFeeConfigArgs []FeeQuoterTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []FeeQuoterTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error)
+
+	OnReport(opts *bind.TransactOpts, metadata []byte, report []byte) (*types.Transaction, error)
+
+	SetReportPermissions(opts *bind.TransactOpts, permissions []KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error)
+
+	TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error)
+
+	UpdatePrices(opts *bind.TransactOpts, priceUpdates InternalPriceUpdates) (*types.Transaction, error)
+
+	UpdateTokenPriceFeeds(opts *bind.TransactOpts, tokenPriceFeedUpdates []FeeQuoterTokenPriceFeedUpdate) (*types.Transaction, error)
+
+	FilterAuthorizedCallerAdded(opts *bind.FilterOpts) (*FeeQuoterAuthorizedCallerAddedIterator, error)
+
+	WatchAuthorizedCallerAdded(opts *bind.WatchOpts, sink chan<- *FeeQuoterAuthorizedCallerAdded) (event.Subscription, error)
+
+	ParseAuthorizedCallerAdded(log types.Log) (*FeeQuoterAuthorizedCallerAdded, error)
+
+	FilterAuthorizedCallerRemoved(opts *bind.FilterOpts) (*FeeQuoterAuthorizedCallerRemovedIterator, error)
+
+	WatchAuthorizedCallerRemoved(opts *bind.WatchOpts, sink chan<- *FeeQuoterAuthorizedCallerRemoved) (event.Subscription, error)
+
+	ParseAuthorizedCallerRemoved(log types.Log) (*FeeQuoterAuthorizedCallerRemoved, error)
+
+	FilterDestChainAdded(opts *bind.FilterOpts, destChainSelector []uint64) (*FeeQuoterDestChainAddedIterator, error)
+
+	WatchDestChainAdded(opts *bind.WatchOpts, sink chan<- *FeeQuoterDestChainAdded, destChainSelector []uint64) (event.Subscription, error)
+
+	ParseDestChainAdded(log types.Log) (*FeeQuoterDestChainAdded, error)
+
+	FilterDestChainConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64) (*FeeQuoterDestChainConfigUpdatedIterator, error)
+
+	WatchDestChainConfigUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterDestChainConfigUpdated, destChainSelector []uint64) (event.Subscription, error)
+
+	ParseDestChainConfigUpdated(log types.Log) (*FeeQuoterDestChainConfigUpdated, error)
+
+	FilterFeeTokenAdded(opts *bind.FilterOpts, feeToken []common.Address) (*FeeQuoterFeeTokenAddedIterator, error)
+
+	WatchFeeTokenAdded(opts *bind.WatchOpts, sink chan<- *FeeQuoterFeeTokenAdded, feeToken []common.Address) (event.Subscription, error)
+
+	ParseFeeTokenAdded(log types.Log) (*FeeQuoterFeeTokenAdded, error)
+
+	FilterFeeTokenRemoved(opts *bind.FilterOpts, feeToken []common.Address) (*FeeQuoterFeeTokenRemovedIterator, error)
+
+	WatchFeeTokenRemoved(opts *bind.WatchOpts, sink chan<- *FeeQuoterFeeTokenRemoved, feeToken []common.Address) (event.Subscription, error)
+
+	ParseFeeTokenRemoved(log types.Log) (*FeeQuoterFeeTokenRemoved, error)
+
+	FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*FeeQuoterOwnershipTransferRequestedIterator, error)
+
+	WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *FeeQuoterOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error)
+
+	ParseOwnershipTransferRequested(log types.Log) (*FeeQuoterOwnershipTransferRequested, error)
+
+	FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*FeeQuoterOwnershipTransferredIterator, error)
+
+	WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *FeeQuoterOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error)
+
+	ParseOwnershipTransferred(log types.Log) (*FeeQuoterOwnershipTransferred, error)
+
+	FilterPremiumMultiplierWeiPerEthUpdated(opts *bind.FilterOpts, token []common.Address) (*FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator, error)
+
+	WatchPremiumMultiplierWeiPerEthUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterPremiumMultiplierWeiPerEthUpdated, token []common.Address) (event.Subscription, error)
+
+	ParsePremiumMultiplierWeiPerEthUpdated(log types.Log) (*FeeQuoterPremiumMultiplierWeiPerEthUpdated, error)
+
+	FilterPriceFeedPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*FeeQuoterPriceFeedPerTokenUpdatedIterator, error)
+
+	WatchPriceFeedPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterPriceFeedPerTokenUpdated, token []common.Address) (event.Subscription, error)
+
+	ParsePriceFeedPerTokenUpdated(log types.Log) (*FeeQuoterPriceFeedPerTokenUpdated, error)
+
+	FilterReportPermissionSet(opts *bind.FilterOpts, reportId [][32]byte) (*FeeQuoterReportPermissionSetIterator, error)
+
+	WatchReportPermissionSet(opts *bind.WatchOpts, sink chan<- *FeeQuoterReportPermissionSet, reportId [][32]byte) (event.Subscription, error)
+
+	ParseReportPermissionSet(log types.Log) (*FeeQuoterReportPermissionSet, error)
+
+	FilterTokenTransferFeeConfigDeleted(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*FeeQuoterTokenTransferFeeConfigDeletedIterator, error)
+
+	WatchTokenTransferFeeConfigDeleted(opts *bind.WatchOpts, sink chan<- *FeeQuoterTokenTransferFeeConfigDeleted, destChainSelector []uint64, token []common.Address) (event.Subscription, error)
+
+	ParseTokenTransferFeeConfigDeleted(log types.Log) (*FeeQuoterTokenTransferFeeConfigDeleted, error)
+
+	FilterTokenTransferFeeConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*FeeQuoterTokenTransferFeeConfigUpdatedIterator, error)
+
+	WatchTokenTransferFeeConfigUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterTokenTransferFeeConfigUpdated, destChainSelector []uint64, token []common.Address) (event.Subscription, error)
+
+	ParseTokenTransferFeeConfigUpdated(log types.Log) (*FeeQuoterTokenTransferFeeConfigUpdated, error)
+
+	FilterUsdPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*FeeQuoterUsdPerTokenUpdatedIterator, error)
+
+	WatchUsdPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterUsdPerTokenUpdated, token []common.Address) (event.Subscription, error)
+
+	ParseUsdPerTokenUpdated(log types.Log) (*FeeQuoterUsdPerTokenUpdated, error)
+
+	FilterUsdPerUnitGasUpdated(opts *bind.FilterOpts, destChain []uint64) (*FeeQuoterUsdPerUnitGasUpdatedIterator, error)
+
+	WatchUsdPerUnitGasUpdated(opts *bind.WatchOpts, sink chan<- *FeeQuoterUsdPerUnitGasUpdated, destChain []uint64) (event.Subscription, error)
+
+	ParseUsdPerUnitGasUpdated(log types.Log) (*FeeQuoterUsdPerUnitGasUpdated, error)
+
+	ParseLog(log types.Log) (generated.AbigenLog, error)
+
+	Address() common.Address
+}
diff --git a/core/gethwrappers/ccip/generated/message_hasher/message_hasher.go b/core/gethwrappers/ccip/generated/message_hasher/message_hasher.go
index 52434b5049..1d95e75778 100644
--- a/core/gethwrappers/ccip/generated/message_hasher/message_hasher.go
+++ b/core/gethwrappers/ccip/generated/message_hasher/message_hasher.go
@@ -59,11 +59,12 @@ type InternalRampTokenAmount struct {
 	DestTokenAddress  []byte
 	ExtraData         []byte
 	Amount            *big.Int
+	DestExecData      []byte
 }
 
 var MessageHasherMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"name\":\"decodeEVMExtraArgsV1\",\"outputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"internalType\":\"structClient.EVMExtraArgsV1\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"allowOutOfOrderExecution\",\"type\":\"bool\"}],\"name\":\"decodeEVMExtraArgsV2\",\"outputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"allowOutOfOrderExecution\",\"type\":\"bool\"}],\"internalType\":\"structClient.EVMExtraArgsV2\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"internalType\":\"structClient.EVMExtraArgsV1\",\"name\":\"extraArgs\",\"type\":\"tuple\"}],\"name\":\"encodeEVMExtraArgsV1\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"allowOutOfOrderExecution\",\"type\":\"bool\"}],\"internalType\":\"structClient.EVMExtraArgsV2\",\"name\":\"extraArgs\",\"type\":\"tuple\"}],\"name\":\"encodeEVMExtraArgsV2\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"leafDomainSeparator\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"implicitMetadataHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"fixedSizeFieldsHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"dataHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"tokenAmountsHash\",\"type\":\"bytes32\"}],\"name\":\"encodeFinalHashPreimage\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"name\":\"encodeFixedSizeFieldsHashPreimage\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"any2EVMMessageHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"name\":\"encodeMetadataHashPreimage\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.RampTokenAmount[]\",\"name\":\"rampTokenAmounts\",\"type\":\"tuple[]\"}],\"name\":\"encodeTokenAmountsHashPreimage\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.Any2EVMRampMessage\",\"name\":\"message\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"name\":\"hash\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]",
-	Bin: "0x608060405234801561001057600080fd5b50610de7806100206000396000f3fe608060405234801561001057600080fd5b50600436106100a35760003560e01c8063a91d3aeb11610076578063c63641bd1161005b578063c63641bd1461019e578063c7ca9a18146101f5578063e733d2091461020857600080fd5b8063a91d3aeb14610150578063b17df7141461016357600080fd5b8063902e94a0146100a85780639511afaa146100d157806399df8d05146100f2578063a1e747df1461013d575b600080fd5b6100bb6100b63660046107d9565b61021b565b6040516100c8919061087a565b60405180910390f35b6100e46100df366004610958565b610244565b6040519081526020016100c8565b6100bb610100366004610a62565b604080516020810196909652858101949094526060850192909252608084015260a0808401919091528151808403909101815260c0909201905290565b6100bb61014b366004610a9d565b610257565b6100bb61015e366004610b05565b610289565b61018f610171366004610b86565b60408051602080820183526000909152815190810190915290815290565b604051905181526020016100c8565b6101d86101ac366004610baf565b604080518082019091526000808252602082015250604080518082019091529182521515602082015290565b6040805182518152602092830151151592810192909252016100c8565b6100bb610203366004610bdb565b6102c1565b6100bb610216366004610c2f565b6102d2565b60608160405160200161022e9190610c71565b6040516020818303038152906040529050919050565b600061025083836102dd565b9392505050565b6060848484846040516020016102709493929190610d3d565b6040516020818303038152906040529050949350505050565b60608686868686866040516020016102a696959493929190610d7a565b60405160208183030381529060405290509695505050505050565b60606102cc8261043a565b92915050565b60606102cc826104fc565b815160208082015160409283015192516000938493610323937f2425b0b9f9054c76ff151b0a175b18f37a4a4e82013a72e9f15c9caa095ed21f93909291889101610d3d565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815290829052805160209182012086518051888401516060808b0151908401516080808d0151950151959761038a9794969395929491939101610d7a565b604051602081830303815290604052805190602001208560400151805190602001208660a001516040516020016103c19190610c71565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181528282528051602091820120908301969096528101939093526060830191909152608082015260a081019190915260c00160405160208183030381529060405280519060200120905092915050565b604051815160248201526020820151151560448201526060907f181dcf1000000000000000000000000000000000000000000000000000000000906064015b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff000000000000000000000000000000000000000000000000000000009093169290921790915292915050565b604051815160248201526060907f97a657c90000000000000000000000000000000000000000000000000000000090604401610479565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040516080810167ffffffffffffffff8111828210171561058557610585610533565b60405290565b60405160c0810167ffffffffffffffff8111828210171561058557610585610533565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156105f5576105f5610533565b604052919050565b600082601f83011261060e57600080fd5b813567ffffffffffffffff81111561062857610628610533565b61065960207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116016105ae565b81815284602083860101111561066e57600080fd5b816020850160208301376000918101602001919091529392505050565b600082601f83011261069c57600080fd5b8135602067ffffffffffffffff808311156106b9576106b9610533565b8260051b6106c88382016105ae565b93845285810183019383810190888611156106e257600080fd5b84880192505b858310156107cd578235848111156107005760008081fd5b88016080818b037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0018113156107365760008081fd5b61073e610562565b87830135878111156107505760008081fd5b61075e8d8a838701016105fd565b825250604080840135888111156107755760008081fd5b6107838e8b838801016105fd565b8a840152506060808501358981111561079c5760008081fd5b6107aa8f8c838901016105fd565b9284019290925293909201359281019290925250825291840191908401906106e8565b98975050505050505050565b6000602082840312156107eb57600080fd5b813567ffffffffffffffff81111561080257600080fd5b61080e8482850161068b565b949350505050565b6000815180845260005b8181101561083c57602081850181015186830182015201610820565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b6020815260006102506020830184610816565b803567ffffffffffffffff811681146108a557600080fd5b919050565b600060a082840312156108bc57600080fd5b60405160a0810181811067ffffffffffffffff821117156108df576108df610533565b604052823581529050806108f56020840161088d565b60208201526109066040840161088d565b60408201526109176060840161088d565b60608201526109286080840161088d565b60808201525092915050565b803573ffffffffffffffffffffffffffffffffffffffff811681146108a557600080fd5b6000806040838503121561096b57600080fd5b823567ffffffffffffffff8082111561098357600080fd5b90840190610140828703121561099857600080fd5b6109a061058b565b6109aa87846108aa565b815260a0830135828111156109be57600080fd5b6109ca888286016105fd565b60208301525060c0830135828111156109e257600080fd5b6109ee888286016105fd565b604083015250610a0060e08401610934565b6060820152610100830135608082015261012083013582811115610a2357600080fd5b610a2f8882860161068b565b60a08301525093506020850135915080821115610a4b57600080fd5b50610a58858286016105fd565b9150509250929050565b600080600080600060a08688031215610a7a57600080fd5b505083359560208501359550604085013594606081013594506080013592509050565b60008060008060808587031215610ab357600080fd5b84359350610ac36020860161088d565b9250610ad16040860161088d565b9150606085013567ffffffffffffffff811115610aed57600080fd5b610af9878288016105fd565b91505092959194509250565b60008060008060008060c08789031215610b1e57600080fd5b86359550602087013567ffffffffffffffff811115610b3c57600080fd5b610b4889828a016105fd565b955050610b5760408801610934565b9350610b656060880161088d565b925060808701359150610b7a60a0880161088d565b90509295509295509295565b600060208284031215610b9857600080fd5b5035919050565b803580151581146108a557600080fd5b60008060408385031215610bc257600080fd5b82359150610bd260208401610b9f565b90509250929050565b600060408284031215610bed57600080fd5b6040516040810181811067ffffffffffffffff82111715610c1057610c10610533565b60405282358152610c2360208401610b9f565b60208201529392505050565b600060208284031215610c4157600080fd5b6040516020810181811067ffffffffffffffff82111715610c6457610c64610533565b6040529135825250919050565b600060208083018184528085518083526040925060408601915060408160051b87010184880160005b83811015610d2f577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0898403018552815160808151818652610cde82870182610816565b915050888201518582038a870152610cf68282610816565b9150508782015185820389870152610d0e8282610816565b60609384015196909301959095525094870194925090860190600101610c9a565b509098975050505050505050565b848152600067ffffffffffffffff808616602084015280851660408401525060806060830152610d706080830184610816565b9695505050505050565b86815260c060208201526000610d9360c0830188610816565b73ffffffffffffffffffffffffffffffffffffffff9690961660408301525067ffffffffffffffff9384166060820152608081019290925290911660a0909101529291505056fea164736f6c6343000818000a",
+	ABI: "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"name\":\"decodeEVMExtraArgsV1\",\"outputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"internalType\":\"structClient.EVMExtraArgsV1\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"allowOutOfOrderExecution\",\"type\":\"bool\"}],\"name\":\"decodeEVMExtraArgsV2\",\"outputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"allowOutOfOrderExecution\",\"type\":\"bool\"}],\"internalType\":\"structClient.EVMExtraArgsV2\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"internalType\":\"structClient.EVMExtraArgsV1\",\"name\":\"extraArgs\",\"type\":\"tuple\"}],\"name\":\"encodeEVMExtraArgsV1\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"allowOutOfOrderExecution\",\"type\":\"bool\"}],\"internalType\":\"structClient.EVMExtraArgsV2\",\"name\":\"extraArgs\",\"type\":\"tuple\"}],\"name\":\"encodeEVMExtraArgsV2\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"leafDomainSeparator\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"implicitMetadataHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"fixedSizeFieldsHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"dataHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"tokenAmountsHash\",\"type\":\"bytes32\"}],\"name\":\"encodeFinalHashPreimage\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"name\":\"encodeFixedSizeFieldsHashPreimage\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"any2EVMMessageHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"name\":\"encodeMetadataHashPreimage\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"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.RampTokenAmount[]\",\"name\":\"rampTokenAmounts\",\"type\":\"tuple[]\"}],\"name\":\"encodeTokenAmountsHashPreimage\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"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.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.Any2EVMRampMessage\",\"name\":\"message\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"name\":\"hash\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]",
+	Bin: "0x608060405234801561001057600080fd5b50610e08806100206000396000f3fe608060405234801561001057600080fd5b50600436106100a35760003560e01c8063a91d3aeb11610076578063c63641bd1161005b578063c63641bd1461019e578063c7ca9a18146101f5578063e733d2091461020857600080fd5b8063a91d3aeb14610150578063b17df7141461016357600080fd5b80632d6d4c5e146100a85780632efb5ac2146100d157806399df8d05146100f2578063a1e747df1461013d575b600080fd5b6100bb6100b63660046107ff565b61021b565b6040516100c891906108a0565b60405180910390f35b6100e46100df36600461095e565b610244565b6040519081526020016100c8565b6100bb610100366004610a68565b604080516020810196909652858101949094526060850192909252608084015260a0808401919091528151808403909101815260c0909201905290565b6100bb61014b366004610aa3565b610257565b6100bb61015e366004610b0b565b610289565b61018f610171366004610b8c565b60408051602080820183526000909152815190810190915290815290565b604051905181526020016100c8565b6101d86101ac366004610bb5565b604080518082019091526000808252602082015250604080518082019091529182521515602082015290565b6040805182518152602092830151151592810192909252016100c8565b6100bb610203366004610be1565b6102c1565b6100bb610216366004610c35565b6102d2565b60608160405160200161022e9190610c77565b6040516020818303038152906040529050919050565b600061025083836102dd565b9392505050565b6060848484846040516020016102709493929190610d5e565b6040516020818303038152906040529050949350505050565b60608686868686866040516020016102a696959493929190610d9b565b60405160208183030381529060405290509695505050505050565b60606102cc8261043a565b92915050565b60606102cc826104fc565b815160208082015160409283015192516000938493610323937f2425b0b9f9054c76ff151b0a175b18f37a4a4e82013a72e9f15c9caa095ed21f93909291889101610d5e565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815290829052805160209182012086518051888401516060808b0151908401516080808d0151950151959761038a9794969395929491939101610d9b565b604051602081830303815290604052805190602001208560400151805190602001208660a001516040516020016103c19190610c77565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181528282528051602091820120908301969096528101939093526060830191909152608082015260a081019190915260c00160405160208183030381529060405280519060200120905092915050565b604051815160248201526020820151151560448201526060907f181dcf1000000000000000000000000000000000000000000000000000000000906064015b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff000000000000000000000000000000000000000000000000000000009093169290921790915292915050565b604051815160248201526060907f97a657c90000000000000000000000000000000000000000000000000000000090604401610479565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60405160a0810167ffffffffffffffff8111828210171561058557610585610533565b60405290565b60405160c0810167ffffffffffffffff8111828210171561058557610585610533565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156105f5576105f5610533565b604052919050565b600082601f83011261060e57600080fd5b813567ffffffffffffffff81111561062857610628610533565b61065960207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116016105ae565b81815284602083860101111561066e57600080fd5b816020850160208301376000918101602001919091529392505050565b600082601f83011261069c57600080fd5b8135602067ffffffffffffffff808311156106b9576106b9610533565b8260051b6106c88382016105ae565b93845285810183019383810190888611156106e257600080fd5b84880192505b858310156107f3578235848111156107005760008081fd5b880160a0818b037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0018113156107365760008081fd5b61073e610562565b87830135878111156107505760008081fd5b61075e8d8a838701016105fd565b825250604080840135888111156107755760008081fd5b6107838e8b838801016105fd565b8a840152506060808501358981111561079c5760008081fd5b6107aa8f8c838901016105fd565b838501525060809150818501358184015250828401359250878311156107d05760008081fd5b6107de8d8a858701016105fd565b908201528452505091840191908401906106e8565b98975050505050505050565b60006020828403121561081157600080fd5b813567ffffffffffffffff81111561082857600080fd5b6108348482850161068b565b949350505050565b6000815180845260005b8181101561086257602081850181015186830182015201610846565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b602081526000610250602083018461083c565b803567ffffffffffffffff811681146108cb57600080fd5b919050565b600060a082840312156108e257600080fd5b6108ea610562565b9050813581526108fc602083016108b3565b602082015261090d604083016108b3565b604082015261091e606083016108b3565b606082015261092f608083016108b3565b608082015292915050565b803573ffffffffffffffffffffffffffffffffffffffff811681146108cb57600080fd5b6000806040838503121561097157600080fd5b823567ffffffffffffffff8082111561098957600080fd5b90840190610140828703121561099e57600080fd5b6109a661058b565b6109b087846108d0565b815260a0830135828111156109c457600080fd5b6109d0888286016105fd565b60208301525060c0830135828111156109e857600080fd5b6109f4888286016105fd565b604083015250610a0660e0840161093a565b6060820152610100830135608082015261012083013582811115610a2957600080fd5b610a358882860161068b565b60a08301525093506020850135915080821115610a5157600080fd5b50610a5e858286016105fd565b9150509250929050565b600080600080600060a08688031215610a8057600080fd5b505083359560208501359550604085013594606081013594506080013592509050565b60008060008060808587031215610ab957600080fd5b84359350610ac9602086016108b3565b9250610ad7604086016108b3565b9150606085013567ffffffffffffffff811115610af357600080fd5b610aff878288016105fd565b91505092959194509250565b60008060008060008060c08789031215610b2457600080fd5b86359550602087013567ffffffffffffffff811115610b4257600080fd5b610b4e89828a016105fd565b955050610b5d6040880161093a565b9350610b6b606088016108b3565b925060808701359150610b8060a088016108b3565b90509295509295509295565b600060208284031215610b9e57600080fd5b5035919050565b803580151581146108cb57600080fd5b60008060408385031215610bc857600080fd5b82359150610bd860208401610ba5565b90509250929050565b600060408284031215610bf357600080fd5b6040516040810181811067ffffffffffffffff82111715610c1657610c16610533565b60405282358152610c2960208401610ba5565b60208201529392505050565b600060208284031215610c4757600080fd5b6040516020810181811067ffffffffffffffff82111715610c6a57610c6a610533565b6040529135825250919050565b600060208083018184528085518083526040925060408601915060408160051b87010184880160005b83811015610d50577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0898403018552815160a08151818652610ce48287018261083c565b915050888201518582038a870152610cfc828261083c565b9150508782015185820389870152610d14828261083c565b915050606080830151818701525060808083015192508582038187015250610d3c818361083c565b968901969450505090860190600101610ca0565b509098975050505050505050565b848152600067ffffffffffffffff808616602084015280851660408401525060806060830152610d91608083018461083c565b9695505050505050565b86815260c060208201526000610db460c083018861083c565b73ffffffffffffffffffffffffffffffffffffffff9690961660408301525067ffffffffffffffff9384166060820152608081019290925290911660a0909101529291505056fea164736f6c6343000818000a",
 }
 
 var MessageHasherABI = MessageHasherMetaData.ABI
diff --git a/core/gethwrappers/ccip/generated/multi_aggregate_rate_limiter/multi_aggregate_rate_limiter.go b/core/gethwrappers/ccip/generated/multi_aggregate_rate_limiter/multi_aggregate_rate_limiter.go
index d8a34b9483..e1942e68da 100644
--- a/core/gethwrappers/ccip/generated/multi_aggregate_rate_limiter/multi_aggregate_rate_limiter.go
+++ b/core/gethwrappers/ccip/generated/multi_aggregate_rate_limiter/multi_aggregate_rate_limiter.go
@@ -87,15 +87,15 @@ type RateLimiterTokenBucket struct {
 }
 
 var MultiAggregateRateLimiterMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"priceRegistry\",\"type\":\"address\"},{\"internalType\":\"address[]\",\"name\":\"authorizedCallers\",\"type\":\"address[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"capacity\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"requested\",\"type\":\"uint256\"}],\"name\":\"AggregateValueMaxCapacityExceeded\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"minWaitInSeconds\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"available\",\"type\":\"uint256\"}],\"name\":\"AggregateValueRateLimitReached\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"BucketOverfilled\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"errorReason\",\"type\":\"bytes\"}],\"name\":\"MessageValidationError\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"PriceNotFoundForToken\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"capacity\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"requested\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"tokenAddress\",\"type\":\"address\"}],\"name\":\"TokenMaxCapacityExceeded\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"minWaitInSeconds\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"available\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"tokenAddress\",\"type\":\"address\"}],\"name\":\"TokenRateLimitReached\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"UnauthorizedCaller\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ZeroAddressNotAllowed\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ZeroChainSelectorNotAllowed\",\"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\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint128\",\"name\":\"capacity\",\"type\":\"uint128\"},{\"internalType\":\"uint128\",\"name\":\"rate\",\"type\":\"uint128\"}],\"indexed\":false,\"internalType\":\"structRateLimiter.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"ConfigChanged\",\"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\":false,\"internalType\":\"address\",\"name\":\"newPriceRegistry\",\"type\":\"address\"}],\"name\":\"PriceRegistrySet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"isOutboundLane\",\"type\":\"bool\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint128\",\"name\":\"capacity\",\"type\":\"uint128\"},{\"internalType\":\"uint128\",\"name\":\"rate\",\"type\":\"uint128\"}],\"indexed\":false,\"internalType\":\"structRateLimiter.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"RateLimiterConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"remoteToken\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"localToken\",\"type\":\"address\"}],\"name\":\"TokenAggregateRateLimitAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"localToken\",\"type\":\"address\"}],\"name\":\"TokenAggregateRateLimitRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"tokens\",\"type\":\"uint256\"}],\"name\":\"TokensConsumed\",\"type\":\"event\"},{\"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\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"isOutboundLane\",\"type\":\"bool\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint128\",\"name\":\"capacity\",\"type\":\"uint128\"},{\"internalType\":\"uint128\",\"name\":\"rate\",\"type\":\"uint128\"}],\"internalType\":\"structRateLimiter.Config\",\"name\":\"rateLimiterConfig\",\"type\":\"tuple\"}],\"internalType\":\"structMultiAggregateRateLimiter.RateLimiterConfigArgs[]\",\"name\":\"rateLimiterUpdates\",\"type\":\"tuple[]\"}],\"name\":\"applyRateLimiterConfigUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"isOutboundLane\",\"type\":\"bool\"}],\"name\":\"currentRateLimiterState\",\"outputs\":[{\"components\":[{\"internalType\":\"uint128\",\"name\":\"tokens\",\"type\":\"uint128\"},{\"internalType\":\"uint32\",\"name\":\"lastUpdated\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint128\",\"name\":\"capacity\",\"type\":\"uint128\"},{\"internalType\":\"uint128\",\"name\":\"rate\",\"type\":\"uint128\"}],\"internalType\":\"structRateLimiter.TokenBucket\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllAuthorizedCallers\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"}],\"name\":\"getAllRateLimitTokens\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"localTokens\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"remoteTokens\",\"type\":\"bytes[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getPriceRegistry\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"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\":\"destTokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structClient.Any2EVMMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"onInboundMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"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\":\"onOutboundMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newPriceRegistry\",\"type\":\"address\"}],\"name\":\"setPriceRegistry\",\"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\":[{\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"localToken\",\"type\":\"address\"}],\"internalType\":\"structMultiAggregateRateLimiter.LocalRateLimitToken[]\",\"name\":\"removes\",\"type\":\"tuple[]\"},{\"components\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"localToken\",\"type\":\"address\"}],\"internalType\":\"structMultiAggregateRateLimiter.LocalRateLimitToken\",\"name\":\"localTokenArgs\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"remoteToken\",\"type\":\"bytes\"}],\"internalType\":\"structMultiAggregateRateLimiter.RateLimitTokenArgs[]\",\"name\":\"adds\",\"type\":\"tuple[]\"}],\"name\":\"updateRateLimitTokens\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
-	Bin: "0x60806040523480156200001157600080fd5b506040516200327338038062003273833981016040819052620000349162000538565b8033806000816200008c5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000bf57620000bf8162000102565b5050604080518082018252838152815160008152602080820190935291810191909152620000ee9150620001ad565b50620000fa82620002fc565b50506200066f565b336001600160a01b038216036200015c5760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000083565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b602081015160005b81518110156200023d576000828281518110620001d657620001d662000621565b60209081029190910101519050620001f060028262000378565b1562000233576040516001600160a01b03821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101620001b5565b50815160005b8151811015620002f657600082828151811062000264576200026462000621565b6020026020010151905060006001600160a01b0316816001600160a01b031603620002a2576040516342bcdf7f60e11b815260040160405180910390fd5b620002af60028262000398565b506040516001600160a01b03821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a15060010162000243565b50505050565b6001600160a01b03811662000324576040516342bcdf7f60e11b815260040160405180910390fd5b600580546001600160a01b0319166001600160a01b0383169081179091556040519081527fdeaac1a8daeabcc5254b10b54edf3678fdfcd1cea89fe9d364b6285f6ace2df99060200160405180910390a150565b60006200038f836001600160a01b038416620003af565b90505b92915050565b60006200038f836001600160a01b038416620004b3565b60008181526001830160205260408120548015620004a8576000620003d660018362000637565b8554909150600090620003ec9060019062000637565b90508181146200045857600086600001828154811062000410576200041062000621565b906000526020600020015490508087600001848154811062000436576200043662000621565b6000918252602080832090910192909255918252600188019052604090208390555b85548690806200046c576200046c62000659565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505062000392565b600091505062000392565b6000818152600183016020526040812054620004fc5750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915562000392565b50600062000392565b80516001600160a01b03811681146200051d57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156200054c57600080fd5b620005578362000505565b602084810151919350906001600160401b03808211156200057757600080fd5b818601915086601f8301126200058c57600080fd5b815181811115620005a157620005a162000522565b8060051b604051601f19603f83011681018181108582111715620005c957620005c962000522565b604052918252848201925083810185019189831115620005e857600080fd5b938501935b828510156200061157620006018562000505565b84529385019392850192620005ed565b8096505050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b818103818111156200039257634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603160045260246000fd5b612bf4806200067f6000396000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c8063537e304e1161008c57806391a2749a1161006657806391a2749a14610252578063e0a0e50614610265578063f2fde38b14610278578063fe843cd01461028b57600080fd5b8063537e304e1461020b57806379ba50971461022c5780638da5cb5b1461023457600080fd5b8063181f5a77116100c8578063181f5a77146101bb5780631af18b7b146101d05780632451a627146101e3578063508ee9de146101f857600080fd5b806308d450a1146100ef5780630a35bcc4146101045780630d6c107e1461017c575b600080fd5b6101026100fd366004612003565b61029e565b005b6101176101123660046120e3565b6102bd565b604051610173919081516fffffffffffffffffffffffffffffffff908116825260208084015163ffffffff1690830152604080840151151590830152606080840151821690830152608092830151169181019190915260a00190565b60405180910390f35b60055473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610173565b6101c3610382565b604051610173919061217a565b6101026101de3660046122b4565b61039e565b6101eb6105ca565b60405161017391906123d1565b6101026102063660046123e4565b6105db565b61021e6102193660046123ff565b6105ec565b60405161017392919061241a565b610102610759565b60005473ffffffffffffffffffffffffffffffffffffffff16610196565b610102610260366004612510565b61085b565b6101026102733660046125a1565b61086c565b6101026102863660046123e4565b6108e1565b610102610299366004612616565b6108f2565b6102a6610c31565b6102ba816020015182608001516000610c76565b50565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091526103796102f58484610d4d565b6040805160a08101825282546fffffffffffffffffffffffffffffffff808216835270010000000000000000000000000000000080830463ffffffff1660208501527401000000000000000000000000000000000000000090920460ff16151593830193909352600190930154808316606083015292909204166080820152610d7d565b90505b92915050565b604051806060016040528060238152602001612bc56023913981565b6103a6610e2f565b60005b82518110156104845760008382815181106103c6576103c661274a565b602002602001015160200151905060008483815181106103e8576103e861274a565b6020908102919091018101515167ffffffffffffffff811660009081526004909252604090912090915061041c9083610eb0565b1561047a576040805167ffffffffffffffff8316815273ffffffffffffffffffffffffffffffffffffffff841660208201527f530cabd30786b7235e124a6c0db77e0b685ef22813b1fe87554247f404eb8ed6910160405180910390a15b50506001016103a9565b5060005b81518110156105c55760008282815181106104a5576104a561274a565b602002602001015160000151905060008383815181106104c7576104c761274a565b6020026020010151602001519050600082602001519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16148061051857508151155b1561054f576040517f8579befe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b825167ffffffffffffffff81166000908152600460205260409020610575908385610ed2565b156105b6577fad72a792d2a307f400c278be7deaeec6964276783304580cdc4e905436b8d5c58184846040516105ad93929190612779565b60405180910390a15b50505050806001019050610488565b505050565b60606105d66002610eff565b905090565b6105e3610e2f565b6102ba81610f0c565b67ffffffffffffffff81166000908152600460205260408120606091829161061390610fd2565b90508067ffffffffffffffff81111561062e5761062e611d74565b604051908082528060200260200182016040528015610657578160200160208202803683370190505b5092508067ffffffffffffffff81111561067357610673611d74565b6040519080825280602002602001820160405280156106a657816020015b60608152602001906001900390816106915790505b50915060005b818110156107525767ffffffffffffffff8516600090815260046020526040812081906106d99084610fdd565b91509150818684815181106106f0576106f061274a565b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508085848151811061073d5761073d61274a565b602090810291909101015250506001016106ac565b5050915091565b60015473ffffffffffffffffffffffffffffffffffffffff1633146107df576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b610863610e2f565b6102ba81610ffc565b610874610c31565b6108dd8261088560408401846127c2565b808060200260200160405190810160405280939291908181526020016000905b828210156108d1576108c26040830286013681900381019061282a565b815260200190600101906108a5565b50505050506001610c76565b5050565b6108e9610e2f565b6102ba81611188565b6108fa610e2f565b60005b81518110156108dd57600082828151811061091a5761091a61274a565b6020908102919091010151604081015181519192509067ffffffffffffffff8116600003610974576040517fc656089500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b602083015160006109858383610d4d565b8054909150700100000000000000000000000000000000900463ffffffff16600003610bd3576040805160a081018252602080870180516fffffffffffffffffffffffffffffffff908116845263ffffffff421692840192909252875115158385015251811660608301529186015190911660808201528215610aec5767ffffffffffffffff8416600090815260066020908152604091829020835160028201805493860151948601516fffffffffffffffffffffffffffffffff9283167fffffffffffffffffffffffff00000000000000000000000000000000000000009095169490941770010000000000000000000000000000000063ffffffff9096168602177fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1674010000000000000000000000000000000000000000941515949094029390931790925560608401516080850151908316921690920217600390910155610bcd565b67ffffffffffffffff84166000908152600660209081526040918290208351815492850151938501516fffffffffffffffffffffffffffffffff9182167fffffffffffffffffffffffff00000000000000000000000000000000000000009094169390931770010000000000000000000000000000000063ffffffff9095168502177fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff167401000000000000000000000000000000000000000093151593909302929092178155606084015160808501519083169216909202176001909101555b50610bdd565b610bdd818561127d565b8267ffffffffffffffff167ff14a5415ce6988a9e870a85fff0b9d7b7dd79bbc228cb63cad610daf6f7b6b978386604051610c19929190612846565b60405180910390a250505050508060010190506108fd565b610c3c60023361142c565b610c74576040517fd86ad9cf0000000000000000000000000000000000000000000000000000000081523360048201526024016107d6565b565b6000610c828483610d4d565b805490915074010000000000000000000000000000000000000000900460ff1615610d47576000805b8451811015610d3257610cf6858281518110610cc957610cc961274a565b6020908102919091018101515167ffffffffffffffff89166000908152600490925260409091209061145b565b15610d2a57610d1d858281518110610d1057610d1061274a565b602002602001015161147d565b610d2790836128b9565b91505b600101610cab565b508015610d4557610d45828260006115b9565b505b50505050565b67ffffffffffffffff821660009081526006602052604081208215610d7657600201905061037c565b905061037c565b6040805160a081018252600080825260208201819052918101829052606081018290526080810191909152610e0b82606001516fffffffffffffffffffffffffffffffff1683600001516fffffffffffffffffffffffffffffffff16846020015163ffffffff1642610def91906128cc565b85608001516fffffffffffffffffffffffffffffffff1661193c565b6fffffffffffffffffffffffffffffffff1682525063ffffffff4216602082015290565b60005473ffffffffffffffffffffffffffffffffffffffff163314610c74576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016107d6565b60006103798373ffffffffffffffffffffffffffffffffffffffff8416611964565b6000610ef58473ffffffffffffffffffffffffffffffffffffffff851684611988565b90505b9392505050565b60606000610ef8836119ad565b73ffffffffffffffffffffffffffffffffffffffff8116610f59576040517f8579befe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600580547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83169081179091556040519081527fdeaac1a8daeabcc5254b10b54edf3678fdfcd1cea89fe9d364b6285f6ace2df99060200160405180910390a150565b600061037c82611a09565b600060608180610fed8686611a14565b909450925050505b9250929050565b602081015160005b81518110156110975760008282815181106110215761102161274a565b6020026020010151905061103f816002611ad190919063ffffffff16565b1561108e5760405173ffffffffffffffffffffffffffffffffffffffff821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101611004565b50815160005b8151811015610d475760008282815181106110ba576110ba61274a565b60200260200101519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff160361112a576040517f8579befe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b611135600282611af3565b5060405173ffffffffffffffffffffffffffffffffffffffff821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a15060010161109d565b3373ffffffffffffffffffffffffffffffffffffffff821603611207576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016107d6565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b81546000906112a690700100000000000000000000000000000000900463ffffffff16426128cc565b9050801561134857600183015483546112ee916fffffffffffffffffffffffffffffffff8082169281169185917001000000000000000000000000000000009091041661193c565b83546fffffffffffffffffffffffffffffffff919091167fffffffffffffffffffffffff0000000000000000000000000000000000000000909116177001000000000000000000000000000000004263ffffffff16021783555b6020820151835461136e916fffffffffffffffffffffffffffffffff9081169116611b15565b83548351151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffff000000000000000000000000000000009091166fffffffffffffffffffffffffffffffff92831617178455602083015160408085015183167001000000000000000000000000000000000291909216176001850155517f9ea3374b67bf275e6bb9c8ae68f9cae023e1c528b4b27e092f0bb209d3531c199061141f9084906128df565b60405180910390a1505050565b73ffffffffffffffffffffffffffffffffffffffff811660009081526001830160205260408120541515610379565b60006103798373ffffffffffffffffffffffffffffffffffffffff8416611b2b565b60055481516040517fd02641a000000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff91821660048201526000928392169063d02641a0906024016040805180830381865afa1580156114f1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611515919061291b565b5190507bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811660000361158b5782516040517f9a655f7b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff90911660048201526024016107d6565b6020830151610ef8907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff831690611b37565b825474010000000000000000000000000000000000000000900460ff1615806115e0575081155b156115ea57505050565b825460018401546fffffffffffffffffffffffffffffffff8083169291169060009061163090700100000000000000000000000000000000900463ffffffff16426128cc565b905080156116f05781831115611672576040517f9725942a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60018601546116ac9083908590849070010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff1661193c565b86547fffffffffffffffffffffffff00000000ffffffffffffffffffffffffffffffff167001000000000000000000000000000000004263ffffffff160217875592505b848210156117a75773ffffffffffffffffffffffffffffffffffffffff841661174f576040517ff94ebcd100000000000000000000000000000000000000000000000000000000815260048101839052602481018690526044016107d6565b6040517f1a76572a000000000000000000000000000000000000000000000000000000008152600481018390526024810186905273ffffffffffffffffffffffffffffffffffffffff851660448201526064016107d6565b848310156118ba5760018681015470010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff169060009082906117eb90826128cc565b6117f5878a6128cc565b6117ff91906128b9565b6118099190612986565b905073ffffffffffffffffffffffffffffffffffffffff8616611862576040517f15279c0800000000000000000000000000000000000000000000000000000000815260048101829052602481018690526044016107d6565b6040517fd0c8d23a000000000000000000000000000000000000000000000000000000008152600481018290526024810186905273ffffffffffffffffffffffffffffffffffffffff871660448201526064016107d6565b6118c485846128cc565b86547fffffffffffffffffffffffffffffffff00000000000000000000000000000000166fffffffffffffffffffffffffffffffff82161787556040518681529093507f1871cdf8010e63f2eb8384381a68dfa7416dc571a5517e66e88b2d2d0c0a690a9060200160405180910390a1505050505050565b600061195b8561194c84866129c1565b61195690876128b9565b611b15565b95945050505050565b6000818152600283016020526040812061197e9082611d26565b6103798383611b74565b600082815260028401602052604081206119a28382612a7b565b50610ef58484611b80565b6060816000018054806020026020016040519081016040528092919081815260200182805480156119fd57602002820191906000526020600020905b8154815260200190600101908083116119e9575b50505050509050919050565b600061037c82611b8c565b6000606081611a238585611b96565b60008181526002870160205260409020805491925082918190611a45906129d8565b80601f0160208091040260200160405190810160405280929190818152602001828054611a71906129d8565b8015611abe5780601f10611a9357610100808354040283529160200191611abe565b820191906000526020600020905b815481529060010190602001808311611aa157829003601f168201915b5050505050905092509250509250929050565b60006103798373ffffffffffffffffffffffffffffffffffffffff8416611ba2565b60006103798373ffffffffffffffffffffffffffffffffffffffff8416611c95565b6000818310611b245781610379565b5090919050565b60006103798383611ce4565b6000670de0b6b3a7640000611b6a837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff86166129c1565b6103799190612986565b60006103798383611ba2565b60006103798383611c95565b600061037c825490565b60006103798383611cfc565b60008181526001830160205260408120548015611c8b576000611bc66001836128cc565b8554909150600090611bda906001906128cc565b9050818114611c3f576000866000018281548110611bfa57611bfa61274a565b9060005260206000200154905080876000018481548110611c1d57611c1d61274a565b6000918252602080832090910192909255918252600188019052604090208390555b8554869080611c5057611c50612b95565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505061037c565b600091505061037c565b6000818152600183016020526040812054611cdc5750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915561037c565b50600061037c565b60008181526001830160205260408120541515610379565b6000826000018281548110611d1357611d1361274a565b9060005260206000200154905092915050565b508054611d32906129d8565b6000825580601f10611d42575050565b601f0160209004906000526020600020908101906102ba91905b80821115611d705760008155600101611d5c565b5090565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715611dc657611dc6611d74565b60405290565b60405160a0810167ffffffffffffffff81118282101715611dc657611dc6611d74565b6040516060810167ffffffffffffffff81118282101715611dc657611dc6611d74565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715611e5957611e59611d74565b604052919050565b803567ffffffffffffffff81168114611e7957600080fd5b919050565b600082601f830112611e8f57600080fd5b813567ffffffffffffffff811115611ea957611ea9611d74565b611eda60207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f84011601611e12565b818152846020838601011115611eef57600080fd5b816020850160208301376000918101602001919091529392505050565b600067ffffffffffffffff821115611f2657611f26611d74565b5060051b60200190565b803573ffffffffffffffffffffffffffffffffffffffff81168114611e7957600080fd5b600060408284031215611f6657600080fd5b611f6e611da3565b9050611f7982611f30565b81526020820135602082015292915050565b600082601f830112611f9c57600080fd5b81356020611fb1611fac83611f0c565b611e12565b8083825260208201915060208460061b870101935086841115611fd357600080fd5b602086015b84811015611ff857611fea8882611f54565b835291830191604001611fd8565b509695505050505050565b60006020828403121561201557600080fd5b813567ffffffffffffffff8082111561202d57600080fd5b9083019060a0828603121561204157600080fd5b612049611dcc565b8235815261205960208401611e61565b602082015260408301358281111561207057600080fd5b61207c87828601611e7e565b60408301525060608301358281111561209457600080fd5b6120a087828601611e7e565b6060830152506080830135828111156120b857600080fd5b6120c487828601611f8b565b60808301525095945050505050565b80358015158114611e7957600080fd5b600080604083850312156120f657600080fd5b6120ff83611e61565b915061210d602084016120d3565b90509250929050565b6000815180845260005b8181101561213c57602081850181015186830182015201612120565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b6020815260006103796020830184612116565b60006040828403121561219f57600080fd5b6121a7611da3565b90506121b282611e61565b81526121c060208301611f30565b602082015292915050565b600082601f8301126121dc57600080fd5b813560206121ec611fac83611f0c565b82815260059290921b8401810191818101908684111561220b57600080fd5b8286015b84811015611ff857803567ffffffffffffffff808211156122305760008081fd5b81890191506060807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0848d030112156122695760008081fd5b612271611da3565b61227d8c89860161218d565b81529083013590828211156122925760008081fd5b6122a08c8984870101611e7e565b81890152865250505091830191830161220f565b60008060408084860312156122c857600080fd5b833567ffffffffffffffff808211156122e057600080fd5b818601915086601f8301126122f457600080fd5b81356020612304611fac83611f0c565b8083825260208201915060208460061b87010193508a84111561232657600080fd5b6020860195505b8386101561234e5761233f8b8761218d565b8252948601949082019061232d565b9750505050602086013592508083111561236757600080fd5b5050612375858286016121cb565b9150509250929050565b60008151808452602080850194506020840160005b838110156123c657815173ffffffffffffffffffffffffffffffffffffffff1687529582019590820190600101612394565b509495945050505050565b602081526000610379602083018461237f565b6000602082840312156123f657600080fd5b61037982611f30565b60006020828403121561241157600080fd5b61037982611e61565b60408152600061242d604083018561237f565b6020838203818501528185518084528284019150828160051b85010183880160005b8381101561249b577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0878403018552612489838351612116565b9486019492509085019060010161244f565b50909998505050505050505050565b600082601f8301126124bb57600080fd5b813560206124cb611fac83611f0c565b8083825260208201915060208460051b8701019350868411156124ed57600080fd5b602086015b84811015611ff85761250381611f30565b83529183019183016124f2565b60006020828403121561252257600080fd5b813567ffffffffffffffff8082111561253a57600080fd5b908301906040828603121561254e57600080fd5b612556611da3565b82358281111561256557600080fd5b612571878286016124aa565b82525060208301358281111561258657600080fd5b612592878286016124aa565b60208301525095945050505050565b600080604083850312156125b457600080fd5b6125bd83611e61565b9150602083013567ffffffffffffffff8111156125d957600080fd5b830160a081860312156125eb57600080fd5b809150509250929050565b80356fffffffffffffffffffffffffffffffff81168114611e7957600080fd5b6000602080838503121561262957600080fd5b823567ffffffffffffffff81111561264057600080fd5b8301601f8101851361265157600080fd5b803561265f611fac82611f0c565b81815260a0918202830184019184820191908884111561267e57600080fd5b938501935b8385101561273e578489038181121561269c5760008081fd5b6126a4611def565b6126ad87611e61565b81526126ba8888016120d3565b8882015260406060807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0850112156126f25760008081fd5b6126fa611def565b9350612707828a016120d3565b8452612714818a016125f6565b8a85015250612725608089016125f6565b8382015281019190915283529384019391850191612683565b50979650505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b67ffffffffffffffff8416815260606020820152600061279c6060830185612116565b905073ffffffffffffffffffffffffffffffffffffffff83166040830152949350505050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126127f757600080fd5b83018035915067ffffffffffffffff82111561281257600080fd5b6020019150600681901b3603821315610ff557600080fd5b60006040828403121561283c57600080fd5b6103798383611f54565b821515815260808101610ef860208301848051151582526020808201516fffffffffffffffffffffffffffffffff9081169184019190915260409182015116910152565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b8082018082111561037c5761037c61288a565b8181038181111561037c5761037c61288a565b6060810161037c82848051151582526020808201516fffffffffffffffffffffffffffffffff9081169184019190915260409182015116910152565b60006040828403121561292d57600080fd5b612935611da3565b82517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8116811461296157600080fd5b8152602083015163ffffffff8116811461297a57600080fd5b60208201529392505050565b6000826129bc577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b808202811582820484141761037c5761037c61288a565b600181811c908216806129ec57607f821691505b602082108103612a25577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b601f8211156105c5576000816000526020600020601f850160051c81016020861015612a545750805b601f850160051c820191505b81811015612a7357828155600101612a60565b505050505050565b815167ffffffffffffffff811115612a9557612a95611d74565b612aa981612aa384546129d8565b84612a2b565b602080601f831160018114612afc5760008415612ac65750858301515b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600386901b1c1916600185901b178555612a73565b6000858152602081207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08616915b82811015612b4957888601518255948401946001909101908401612b2a565b5085821015612b8557878501517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600388901b60f8161c191681555b5050505050600190811b01905550565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfe4d756c7469416767726567617465526174654c696d6974657220312e362e302d646576a164736f6c6343000818000a",
+	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"feeQuoter\",\"type\":\"address\"},{\"internalType\":\"address[]\",\"name\":\"authorizedCallers\",\"type\":\"address[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"capacity\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"requested\",\"type\":\"uint256\"}],\"name\":\"AggregateValueMaxCapacityExceeded\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"minWaitInSeconds\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"available\",\"type\":\"uint256\"}],\"name\":\"AggregateValueRateLimitReached\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"BucketOverfilled\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"errorReason\",\"type\":\"bytes\"}],\"name\":\"MessageValidationError\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"PriceNotFoundForToken\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"capacity\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"requested\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"tokenAddress\",\"type\":\"address\"}],\"name\":\"TokenMaxCapacityExceeded\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"minWaitInSeconds\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"available\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"tokenAddress\",\"type\":\"address\"}],\"name\":\"TokenRateLimitReached\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"UnauthorizedCaller\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ZeroAddressNotAllowed\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ZeroChainSelectorNotAllowed\",\"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\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint128\",\"name\":\"capacity\",\"type\":\"uint128\"},{\"internalType\":\"uint128\",\"name\":\"rate\",\"type\":\"uint128\"}],\"indexed\":false,\"internalType\":\"structRateLimiter.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"ConfigChanged\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"newFeeQuoter\",\"type\":\"address\"}],\"name\":\"FeeQuoterSet\",\"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\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"isOutboundLane\",\"type\":\"bool\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint128\",\"name\":\"capacity\",\"type\":\"uint128\"},{\"internalType\":\"uint128\",\"name\":\"rate\",\"type\":\"uint128\"}],\"indexed\":false,\"internalType\":\"structRateLimiter.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"RateLimiterConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"remoteToken\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"localToken\",\"type\":\"address\"}],\"name\":\"TokenAggregateRateLimitAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"localToken\",\"type\":\"address\"}],\"name\":\"TokenAggregateRateLimitRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"tokens\",\"type\":\"uint256\"}],\"name\":\"TokensConsumed\",\"type\":\"event\"},{\"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\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"isOutboundLane\",\"type\":\"bool\"},{\"components\":[{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint128\",\"name\":\"capacity\",\"type\":\"uint128\"},{\"internalType\":\"uint128\",\"name\":\"rate\",\"type\":\"uint128\"}],\"internalType\":\"structRateLimiter.Config\",\"name\":\"rateLimiterConfig\",\"type\":\"tuple\"}],\"internalType\":\"structMultiAggregateRateLimiter.RateLimiterConfigArgs[]\",\"name\":\"rateLimiterUpdates\",\"type\":\"tuple[]\"}],\"name\":\"applyRateLimiterConfigUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"isOutboundLane\",\"type\":\"bool\"}],\"name\":\"currentRateLimiterState\",\"outputs\":[{\"components\":[{\"internalType\":\"uint128\",\"name\":\"tokens\",\"type\":\"uint128\"},{\"internalType\":\"uint32\",\"name\":\"lastUpdated\",\"type\":\"uint32\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint128\",\"name\":\"capacity\",\"type\":\"uint128\"},{\"internalType\":\"uint128\",\"name\":\"rate\",\"type\":\"uint128\"}],\"internalType\":\"structRateLimiter.TokenBucket\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllAuthorizedCallers\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"}],\"name\":\"getAllRateLimitTokens\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"localTokens\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"remoteTokens\",\"type\":\"bytes[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getFeeQuoter\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"feeQuoter\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"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\":\"destTokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structClient.Any2EVMMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"onInboundMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"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\":\"onOutboundMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newFeeQuoter\",\"type\":\"address\"}],\"name\":\"setFeeQuoter\",\"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\":[{\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"localToken\",\"type\":\"address\"}],\"internalType\":\"structMultiAggregateRateLimiter.LocalRateLimitToken[]\",\"name\":\"removes\",\"type\":\"tuple[]\"},{\"components\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"remoteChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"localToken\",\"type\":\"address\"}],\"internalType\":\"structMultiAggregateRateLimiter.LocalRateLimitToken\",\"name\":\"localTokenArgs\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"remoteToken\",\"type\":\"bytes\"}],\"internalType\":\"structMultiAggregateRateLimiter.RateLimitTokenArgs[]\",\"name\":\"adds\",\"type\":\"tuple[]\"}],\"name\":\"updateRateLimitTokens\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	Bin: "0x60806040523480156200001157600080fd5b506040516200327338038062003273833981016040819052620000349162000538565b8033806000816200008c5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000bf57620000bf8162000102565b5050604080518082018252838152815160008152602080820190935291810191909152620000ee9150620001ad565b50620000fa82620002fc565b50506200066f565b336001600160a01b038216036200015c5760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000083565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b602081015160005b81518110156200023d576000828281518110620001d657620001d662000621565b60209081029190910101519050620001f060028262000378565b1562000233576040516001600160a01b03821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101620001b5565b50815160005b8151811015620002f657600082828151811062000264576200026462000621565b6020026020010151905060006001600160a01b0316816001600160a01b031603620002a2576040516342bcdf7f60e11b815260040160405180910390fd5b620002af60028262000398565b506040516001600160a01b03821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a15060010162000243565b50505050565b6001600160a01b03811662000324576040516342bcdf7f60e11b815260040160405180910390fd5b600580546001600160a01b0319166001600160a01b0383169081179091556040519081527f7c737a8eddf62436489aa3600ed26e75e0a58b0f8c0d266bbcee64358c39fdac9060200160405180910390a150565b60006200038f836001600160a01b038416620003af565b90505b92915050565b60006200038f836001600160a01b038416620004b3565b60008181526001830160205260408120548015620004a8576000620003d660018362000637565b8554909150600090620003ec9060019062000637565b90508181146200045857600086600001828154811062000410576200041062000621565b906000526020600020015490508087600001848154811062000436576200043662000621565b6000918252602080832090910192909255918252600188019052604090208390555b85548690806200046c576200046c62000659565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505062000392565b600091505062000392565b6000818152600183016020526040812054620004fc5750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915562000392565b50600062000392565b80516001600160a01b03811681146200051d57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156200054c57600080fd5b620005578362000505565b602084810151919350906001600160401b03808211156200057757600080fd5b818601915086601f8301126200058c57600080fd5b815181811115620005a157620005a162000522565b8060051b604051601f19603f83011681018181108582111715620005c957620005c962000522565b604052918252848201925083810185019189831115620005e857600080fd5b938501935b828510156200061157620006018562000505565b84529385019392850192620005ed565b8096505050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b818103818111156200039257634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603160045260246000fd5b612bf4806200067f6000396000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c80638da5cb5b1161008c578063e145291611610066578063e145291614610247578063e835232b14610265578063f2fde38b14610278578063fe843cd01461028b57600080fd5b80638da5cb5b146101e257806391a2749a14610221578063e0a0e5061461023457600080fd5b80631af18b7b116100c85780631af18b7b146101915780632451a627146101a4578063537e304e146101b957806379ba5097146101da57600080fd5b806308d450a1146100ef5780630a35bcc414610104578063181f5a771461017c575b600080fd5b6101026100fd366004612003565b61029e565b005b6101176101123660046120e3565b6102bd565b604051610173919081516fffffffffffffffffffffffffffffffff908116825260208084015163ffffffff1690830152604080840151151590830152606080840151821690830152608092830151169181019190915260a00190565b60405180910390f35b610184610382565b604051610173919061217a565b61010261019f3660046122b4565b61039e565b6101ac6105ca565b60405161017391906123d1565b6101cc6101c73660046123e4565b6105db565b6040516101739291906123ff565b610102610748565b60005473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610173565b61010261022f3660046124f5565b61084a565b610102610242366004612586565b61085b565b60055473ffffffffffffffffffffffffffffffffffffffff166101fc565b6101026102733660046125db565b6108d0565b6101026102863660046125db565b6108e1565b610102610299366004612616565b6108f2565b6102a6610c31565b6102ba816020015182608001516000610c76565b50565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091526103796102f58484610d4d565b6040805160a08101825282546fffffffffffffffffffffffffffffffff808216835270010000000000000000000000000000000080830463ffffffff1660208501527401000000000000000000000000000000000000000090920460ff16151593830193909352600190930154808316606083015292909204166080820152610d7d565b90505b92915050565b604051806060016040528060238152602001612bc56023913981565b6103a6610e2f565b60005b82518110156104845760008382815181106103c6576103c661274a565b602002602001015160200151905060008483815181106103e8576103e861274a565b6020908102919091018101515167ffffffffffffffff811660009081526004909252604090912090915061041c9083610eb0565b1561047a576040805167ffffffffffffffff8316815273ffffffffffffffffffffffffffffffffffffffff841660208201527f530cabd30786b7235e124a6c0db77e0b685ef22813b1fe87554247f404eb8ed6910160405180910390a15b50506001016103a9565b5060005b81518110156105c55760008282815181106104a5576104a561274a565b602002602001015160000151905060008383815181106104c7576104c761274a565b6020026020010151602001519050600082602001519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16148061051857508151155b1561054f576040517f8579befe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b825167ffffffffffffffff81166000908152600460205260409020610575908385610ed2565b156105b6577fad72a792d2a307f400c278be7deaeec6964276783304580cdc4e905436b8d5c58184846040516105ad93929190612779565b60405180910390a15b50505050806001019050610488565b505050565b60606105d66002610eff565b905090565b67ffffffffffffffff81166000908152600460205260408120606091829161060290610f0c565b90508067ffffffffffffffff81111561061d5761061d611d74565b604051908082528060200260200182016040528015610646578160200160208202803683370190505b5092508067ffffffffffffffff81111561066257610662611d74565b60405190808252806020026020018201604052801561069557816020015b60608152602001906001900390816106805790505b50915060005b818110156107415767ffffffffffffffff8516600090815260046020526040812081906106c89084610f17565b91509150818684815181106106df576106df61274a565b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508085848151811061072c5761072c61274a565b6020908102919091010152505060010161069b565b5050915091565b60015473ffffffffffffffffffffffffffffffffffffffff1633146107ce576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b610852610e2f565b6102ba81610f36565b610863610c31565b6108cc8261087460408401846127c2565b808060200260200160405190810160405280939291908181526020016000905b828210156108c0576108b16040830286013681900381019061282a565b81526020019060010190610894565b50505050506001610c76565b5050565b6108d8610e2f565b6102ba816110c2565b6108e9610e2f565b6102ba81611188565b6108fa610e2f565b60005b81518110156108cc57600082828151811061091a5761091a61274a565b6020908102919091010151604081015181519192509067ffffffffffffffff8116600003610974576040517fc656089500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b602083015160006109858383610d4d565b8054909150700100000000000000000000000000000000900463ffffffff16600003610bd3576040805160a081018252602080870180516fffffffffffffffffffffffffffffffff908116845263ffffffff421692840192909252875115158385015251811660608301529186015190911660808201528215610aec5767ffffffffffffffff8416600090815260066020908152604091829020835160028201805493860151948601516fffffffffffffffffffffffffffffffff9283167fffffffffffffffffffffffff00000000000000000000000000000000000000009095169490941770010000000000000000000000000000000063ffffffff9096168602177fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1674010000000000000000000000000000000000000000941515949094029390931790925560608401516080850151908316921690920217600390910155610bcd565b67ffffffffffffffff84166000908152600660209081526040918290208351815492850151938501516fffffffffffffffffffffffffffffffff9182167fffffffffffffffffffffffff00000000000000000000000000000000000000009094169390931770010000000000000000000000000000000063ffffffff9095168502177fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff167401000000000000000000000000000000000000000093151593909302929092178155606084015160808501519083169216909202176001909101555b50610bdd565b610bdd818561127d565b8267ffffffffffffffff167ff14a5415ce6988a9e870a85fff0b9d7b7dd79bbc228cb63cad610daf6f7b6b978386604051610c19929190612846565b60405180910390a250505050508060010190506108fd565b610c3c60023361142c565b610c74576040517fd86ad9cf0000000000000000000000000000000000000000000000000000000081523360048201526024016107c5565b565b6000610c828483610d4d565b805490915074010000000000000000000000000000000000000000900460ff1615610d47576000805b8451811015610d3257610cf6858281518110610cc957610cc961274a565b6020908102919091018101515167ffffffffffffffff89166000908152600490925260409091209061145b565b15610d2a57610d1d858281518110610d1057610d1061274a565b602002602001015161147d565b610d2790836128b9565b91505b600101610cab565b508015610d4557610d45828260006115b9565b505b50505050565b67ffffffffffffffff821660009081526006602052604081208215610d7657600201905061037c565b905061037c565b6040805160a081018252600080825260208201819052918101829052606081018290526080810191909152610e0b82606001516fffffffffffffffffffffffffffffffff1683600001516fffffffffffffffffffffffffffffffff16846020015163ffffffff1642610def91906128cc565b85608001516fffffffffffffffffffffffffffffffff1661193c565b6fffffffffffffffffffffffffffffffff1682525063ffffffff4216602082015290565b60005473ffffffffffffffffffffffffffffffffffffffff163314610c74576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016107c5565b60006103798373ffffffffffffffffffffffffffffffffffffffff8416611964565b6000610ef58473ffffffffffffffffffffffffffffffffffffffff851684611988565b90505b9392505050565b60606000610ef8836119ad565b600061037c82611a09565b600060608180610f278686611a14565b909450925050505b9250929050565b602081015160005b8151811015610fd1576000828281518110610f5b57610f5b61274a565b60200260200101519050610f79816002611ad190919063ffffffff16565b15610fc85760405173ffffffffffffffffffffffffffffffffffffffff821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101610f3e565b50815160005b8151811015610d47576000828281518110610ff457610ff461274a565b60200260200101519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603611064576040517f8579befe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61106f600282611af3565b5060405173ffffffffffffffffffffffffffffffffffffffff821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a150600101610fd7565b73ffffffffffffffffffffffffffffffffffffffff811661110f576040517f8579befe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600580547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83169081179091556040519081527f7c737a8eddf62436489aa3600ed26e75e0a58b0f8c0d266bbcee64358c39fdac9060200160405180910390a150565b3373ffffffffffffffffffffffffffffffffffffffff821603611207576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016107c5565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b81546000906112a690700100000000000000000000000000000000900463ffffffff16426128cc565b9050801561134857600183015483546112ee916fffffffffffffffffffffffffffffffff8082169281169185917001000000000000000000000000000000009091041661193c565b83546fffffffffffffffffffffffffffffffff919091167fffffffffffffffffffffffff0000000000000000000000000000000000000000909116177001000000000000000000000000000000004263ffffffff16021783555b6020820151835461136e916fffffffffffffffffffffffffffffffff9081169116611b15565b83548351151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffff000000000000000000000000000000009091166fffffffffffffffffffffffffffffffff92831617178455602083015160408085015183167001000000000000000000000000000000000291909216176001850155517f9ea3374b67bf275e6bb9c8ae68f9cae023e1c528b4b27e092f0bb209d3531c199061141f9084906128df565b60405180910390a1505050565b73ffffffffffffffffffffffffffffffffffffffff811660009081526001830160205260408120541515610379565b60006103798373ffffffffffffffffffffffffffffffffffffffff8416611b2b565b60055481516040517fd02641a000000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff91821660048201526000928392169063d02641a0906024016040805180830381865afa1580156114f1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611515919061291b565b5190507bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811660000361158b5782516040517f9a655f7b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff90911660048201526024016107c5565b6020830151610ef8907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff831690611b37565b825474010000000000000000000000000000000000000000900460ff1615806115e0575081155b156115ea57505050565b825460018401546fffffffffffffffffffffffffffffffff8083169291169060009061163090700100000000000000000000000000000000900463ffffffff16426128cc565b905080156116f05781831115611672576040517f9725942a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60018601546116ac9083908590849070010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff1661193c565b86547fffffffffffffffffffffffff00000000ffffffffffffffffffffffffffffffff167001000000000000000000000000000000004263ffffffff160217875592505b848210156117a75773ffffffffffffffffffffffffffffffffffffffff841661174f576040517ff94ebcd100000000000000000000000000000000000000000000000000000000815260048101839052602481018690526044016107c5565b6040517f1a76572a000000000000000000000000000000000000000000000000000000008152600481018390526024810186905273ffffffffffffffffffffffffffffffffffffffff851660448201526064016107c5565b848310156118ba5760018681015470010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff169060009082906117eb90826128cc565b6117f5878a6128cc565b6117ff91906128b9565b6118099190612986565b905073ffffffffffffffffffffffffffffffffffffffff8616611862576040517f15279c0800000000000000000000000000000000000000000000000000000000815260048101829052602481018690526044016107c5565b6040517fd0c8d23a000000000000000000000000000000000000000000000000000000008152600481018290526024810186905273ffffffffffffffffffffffffffffffffffffffff871660448201526064016107c5565b6118c485846128cc565b86547fffffffffffffffffffffffffffffffff00000000000000000000000000000000166fffffffffffffffffffffffffffffffff82161787556040518681529093507f1871cdf8010e63f2eb8384381a68dfa7416dc571a5517e66e88b2d2d0c0a690a9060200160405180910390a1505050505050565b600061195b8561194c84866129c1565b61195690876128b9565b611b15565b95945050505050565b6000818152600283016020526040812061197e9082611d26565b6103798383611b74565b600082815260028401602052604081206119a28382612a7b565b50610ef58484611b80565b6060816000018054806020026020016040519081016040528092919081815260200182805480156119fd57602002820191906000526020600020905b8154815260200190600101908083116119e9575b50505050509050919050565b600061037c82611b8c565b6000606081611a238585611b96565b60008181526002870160205260409020805491925082918190611a45906129d8565b80601f0160208091040260200160405190810160405280929190818152602001828054611a71906129d8565b8015611abe5780601f10611a9357610100808354040283529160200191611abe565b820191906000526020600020905b815481529060010190602001808311611aa157829003601f168201915b5050505050905092509250509250929050565b60006103798373ffffffffffffffffffffffffffffffffffffffff8416611ba2565b60006103798373ffffffffffffffffffffffffffffffffffffffff8416611c95565b6000818310611b245781610379565b5090919050565b60006103798383611ce4565b6000670de0b6b3a7640000611b6a837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff86166129c1565b6103799190612986565b60006103798383611ba2565b60006103798383611c95565b600061037c825490565b60006103798383611cfc565b60008181526001830160205260408120548015611c8b576000611bc66001836128cc565b8554909150600090611bda906001906128cc565b9050818114611c3f576000866000018281548110611bfa57611bfa61274a565b9060005260206000200154905080876000018481548110611c1d57611c1d61274a565b6000918252602080832090910192909255918252600188019052604090208390555b8554869080611c5057611c50612b95565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505061037c565b600091505061037c565b6000818152600183016020526040812054611cdc5750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915561037c565b50600061037c565b60008181526001830160205260408120541515610379565b6000826000018281548110611d1357611d1361274a565b9060005260206000200154905092915050565b508054611d32906129d8565b6000825580601f10611d42575050565b601f0160209004906000526020600020908101906102ba91905b80821115611d705760008155600101611d5c565b5090565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715611dc657611dc6611d74565b60405290565b60405160a0810167ffffffffffffffff81118282101715611dc657611dc6611d74565b6040516060810167ffffffffffffffff81118282101715611dc657611dc6611d74565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715611e5957611e59611d74565b604052919050565b803567ffffffffffffffff81168114611e7957600080fd5b919050565b600082601f830112611e8f57600080fd5b813567ffffffffffffffff811115611ea957611ea9611d74565b611eda60207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f84011601611e12565b818152846020838601011115611eef57600080fd5b816020850160208301376000918101602001919091529392505050565b600067ffffffffffffffff821115611f2657611f26611d74565b5060051b60200190565b803573ffffffffffffffffffffffffffffffffffffffff81168114611e7957600080fd5b600060408284031215611f6657600080fd5b611f6e611da3565b9050611f7982611f30565b81526020820135602082015292915050565b600082601f830112611f9c57600080fd5b81356020611fb1611fac83611f0c565b611e12565b8083825260208201915060208460061b870101935086841115611fd357600080fd5b602086015b84811015611ff857611fea8882611f54565b835291830191604001611fd8565b509695505050505050565b60006020828403121561201557600080fd5b813567ffffffffffffffff8082111561202d57600080fd5b9083019060a0828603121561204157600080fd5b612049611dcc565b8235815261205960208401611e61565b602082015260408301358281111561207057600080fd5b61207c87828601611e7e565b60408301525060608301358281111561209457600080fd5b6120a087828601611e7e565b6060830152506080830135828111156120b857600080fd5b6120c487828601611f8b565b60808301525095945050505050565b80358015158114611e7957600080fd5b600080604083850312156120f657600080fd5b6120ff83611e61565b915061210d602084016120d3565b90509250929050565b6000815180845260005b8181101561213c57602081850181015186830182015201612120565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b6020815260006103796020830184612116565b60006040828403121561219f57600080fd5b6121a7611da3565b90506121b282611e61565b81526121c060208301611f30565b602082015292915050565b600082601f8301126121dc57600080fd5b813560206121ec611fac83611f0c565b82815260059290921b8401810191818101908684111561220b57600080fd5b8286015b84811015611ff857803567ffffffffffffffff808211156122305760008081fd5b81890191506060807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0848d030112156122695760008081fd5b612271611da3565b61227d8c89860161218d565b81529083013590828211156122925760008081fd5b6122a08c8984870101611e7e565b81890152865250505091830191830161220f565b60008060408084860312156122c857600080fd5b833567ffffffffffffffff808211156122e057600080fd5b818601915086601f8301126122f457600080fd5b81356020612304611fac83611f0c565b8083825260208201915060208460061b87010193508a84111561232657600080fd5b6020860195505b8386101561234e5761233f8b8761218d565b8252948601949082019061232d565b9750505050602086013592508083111561236757600080fd5b5050612375858286016121cb565b9150509250929050565b60008151808452602080850194506020840160005b838110156123c657815173ffffffffffffffffffffffffffffffffffffffff1687529582019590820190600101612394565b509495945050505050565b602081526000610379602083018461237f565b6000602082840312156123f657600080fd5b61037982611e61565b604081526000612412604083018561237f565b6020838203818501528185518084528284019150828160051b85010183880160005b83811015612480577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe087840301855261246e838351612116565b94860194925090850190600101612434565b50909998505050505050505050565b600082601f8301126124a057600080fd5b813560206124b0611fac83611f0c565b8083825260208201915060208460051b8701019350868411156124d257600080fd5b602086015b84811015611ff8576124e881611f30565b83529183019183016124d7565b60006020828403121561250757600080fd5b813567ffffffffffffffff8082111561251f57600080fd5b908301906040828603121561253357600080fd5b61253b611da3565b82358281111561254a57600080fd5b6125568782860161248f565b82525060208301358281111561256b57600080fd5b6125778782860161248f565b60208301525095945050505050565b6000806040838503121561259957600080fd5b6125a283611e61565b9150602083013567ffffffffffffffff8111156125be57600080fd5b830160a081860312156125d057600080fd5b809150509250929050565b6000602082840312156125ed57600080fd5b61037982611f30565b80356fffffffffffffffffffffffffffffffff81168114611e7957600080fd5b6000602080838503121561262957600080fd5b823567ffffffffffffffff81111561264057600080fd5b8301601f8101851361265157600080fd5b803561265f611fac82611f0c565b81815260a0918202830184019184820191908884111561267e57600080fd5b938501935b8385101561273e578489038181121561269c5760008081fd5b6126a4611def565b6126ad87611e61565b81526126ba8888016120d3565b8882015260406060807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0850112156126f25760008081fd5b6126fa611def565b9350612707828a016120d3565b8452612714818a016125f6565b8a85015250612725608089016125f6565b8382015281019190915283529384019391850191612683565b50979650505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b67ffffffffffffffff8416815260606020820152600061279c6060830185612116565b905073ffffffffffffffffffffffffffffffffffffffff83166040830152949350505050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126127f757600080fd5b83018035915067ffffffffffffffff82111561281257600080fd5b6020019150600681901b3603821315610f2f57600080fd5b60006040828403121561283c57600080fd5b6103798383611f54565b821515815260808101610ef860208301848051151582526020808201516fffffffffffffffffffffffffffffffff9081169184019190915260409182015116910152565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b8082018082111561037c5761037c61288a565b8181038181111561037c5761037c61288a565b6060810161037c82848051151582526020808201516fffffffffffffffffffffffffffffffff9081169184019190915260409182015116910152565b60006040828403121561292d57600080fd5b612935611da3565b82517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8116811461296157600080fd5b8152602083015163ffffffff8116811461297a57600080fd5b60208201529392505050565b6000826129bc577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b808202811582820484141761037c5761037c61288a565b600181811c908216806129ec57607f821691505b602082108103612a25577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b601f8211156105c5576000816000526020600020601f850160051c81016020861015612a545750805b601f850160051c820191505b81811015612a7357828155600101612a60565b505050505050565b815167ffffffffffffffff811115612a9557612a95611d74565b612aa981612aa384546129d8565b84612a2b565b602080601f831160018114612afc5760008415612ac65750858301515b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600386901b1c1916600185901b178555612a73565b6000858152602081207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08616915b82811015612b4957888601518255948401946001909101908401612b2a565b5085821015612b8557878501517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600388901b60f8161c191681555b5050505050600190811b01905550565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfe4d756c7469416767726567617465526174654c696d6974657220312e362e302d646576a164736f6c6343000818000a",
 }
 
 var MultiAggregateRateLimiterABI = MultiAggregateRateLimiterMetaData.ABI
 
 var MultiAggregateRateLimiterBin = MultiAggregateRateLimiterMetaData.Bin
 
-func DeployMultiAggregateRateLimiter(auth *bind.TransactOpts, backend bind.ContractBackend, priceRegistry common.Address, authorizedCallers []common.Address) (common.Address, *types.Transaction, *MultiAggregateRateLimiter, error) {
+func DeployMultiAggregateRateLimiter(auth *bind.TransactOpts, backend bind.ContractBackend, feeQuoter common.Address, authorizedCallers []common.Address) (common.Address, *types.Transaction, *MultiAggregateRateLimiter, error) {
 	parsed, err := MultiAggregateRateLimiterMetaData.GetAbi()
 	if err != nil {
 		return common.Address{}, nil, nil, err
@@ -104,7 +104,7 @@ func DeployMultiAggregateRateLimiter(auth *bind.TransactOpts, backend bind.Contr
 		return common.Address{}, nil, nil, errors.New("GetABI returned nil")
 	}
 
-	address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(MultiAggregateRateLimiterBin), backend, priceRegistry, authorizedCallers)
+	address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(MultiAggregateRateLimiterBin), backend, feeQuoter, authorizedCallers)
 	if err != nil {
 		return common.Address{}, nil, nil, err
 	}
@@ -301,9 +301,9 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterCallerSession) GetAll
 	return _MultiAggregateRateLimiter.Contract.GetAllRateLimitTokens(&_MultiAggregateRateLimiter.CallOpts, remoteChainSelector)
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterCaller) GetPriceRegistry(opts *bind.CallOpts) (common.Address, error) {
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterCaller) GetFeeQuoter(opts *bind.CallOpts) (common.Address, error) {
 	var out []interface{}
-	err := _MultiAggregateRateLimiter.contract.Call(opts, &out, "getPriceRegistry")
+	err := _MultiAggregateRateLimiter.contract.Call(opts, &out, "getFeeQuoter")
 
 	if err != nil {
 		return *new(common.Address), err
@@ -315,12 +315,12 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterCaller) GetPriceRegis
 
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterSession) GetPriceRegistry() (common.Address, error) {
-	return _MultiAggregateRateLimiter.Contract.GetPriceRegistry(&_MultiAggregateRateLimiter.CallOpts)
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterSession) GetFeeQuoter() (common.Address, error) {
+	return _MultiAggregateRateLimiter.Contract.GetFeeQuoter(&_MultiAggregateRateLimiter.CallOpts)
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterCallerSession) GetPriceRegistry() (common.Address, error) {
-	return _MultiAggregateRateLimiter.Contract.GetPriceRegistry(&_MultiAggregateRateLimiter.CallOpts)
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterCallerSession) GetFeeQuoter() (common.Address, error) {
+	return _MultiAggregateRateLimiter.Contract.GetFeeQuoter(&_MultiAggregateRateLimiter.CallOpts)
 }
 
 func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterCaller) Owner(opts *bind.CallOpts) (common.Address, error) {
@@ -427,16 +427,16 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterTransactorSession) On
 	return _MultiAggregateRateLimiter.Contract.OnOutboundMessage(&_MultiAggregateRateLimiter.TransactOpts, destChainSelector, message)
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterTransactor) SetPriceRegistry(opts *bind.TransactOpts, newPriceRegistry common.Address) (*types.Transaction, error) {
-	return _MultiAggregateRateLimiter.contract.Transact(opts, "setPriceRegistry", newPriceRegistry)
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterTransactor) SetFeeQuoter(opts *bind.TransactOpts, newFeeQuoter common.Address) (*types.Transaction, error) {
+	return _MultiAggregateRateLimiter.contract.Transact(opts, "setFeeQuoter", newFeeQuoter)
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterSession) SetPriceRegistry(newPriceRegistry common.Address) (*types.Transaction, error) {
-	return _MultiAggregateRateLimiter.Contract.SetPriceRegistry(&_MultiAggregateRateLimiter.TransactOpts, newPriceRegistry)
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterSession) SetFeeQuoter(newFeeQuoter common.Address) (*types.Transaction, error) {
+	return _MultiAggregateRateLimiter.Contract.SetFeeQuoter(&_MultiAggregateRateLimiter.TransactOpts, newFeeQuoter)
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterTransactorSession) SetPriceRegistry(newPriceRegistry common.Address) (*types.Transaction, error) {
-	return _MultiAggregateRateLimiter.Contract.SetPriceRegistry(&_MultiAggregateRateLimiter.TransactOpts, newPriceRegistry)
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterTransactorSession) SetFeeQuoter(newFeeQuoter common.Address) (*types.Transaction, error) {
+	return _MultiAggregateRateLimiter.Contract.SetFeeQuoter(&_MultiAggregateRateLimiter.TransactOpts, newFeeQuoter)
 }
 
 func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterTransactor) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
@@ -814,8 +814,8 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) ParseConfig
 	return event, nil
 }
 
-type MultiAggregateRateLimiterOwnershipTransferRequestedIterator struct {
-	Event *MultiAggregateRateLimiterOwnershipTransferRequested
+type MultiAggregateRateLimiterFeeQuoterSetIterator struct {
+	Event *MultiAggregateRateLimiterFeeQuoterSet
 
 	contract *bind.BoundContract
 	event    string
@@ -826,7 +826,7 @@ type MultiAggregateRateLimiterOwnershipTransferRequestedIterator struct {
 	fail error
 }
 
-func (it *MultiAggregateRateLimiterOwnershipTransferRequestedIterator) Next() bool {
+func (it *MultiAggregateRateLimiterFeeQuoterSetIterator) Next() bool {
 
 	if it.fail != nil {
 		return false
@@ -835,7 +835,7 @@ func (it *MultiAggregateRateLimiterOwnershipTransferRequestedIterator) Next() bo
 	if it.done {
 		select {
 		case log := <-it.logs:
-			it.Event = new(MultiAggregateRateLimiterOwnershipTransferRequested)
+			it.Event = new(MultiAggregateRateLimiterFeeQuoterSet)
 			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
 				it.fail = err
 				return false
@@ -850,7 +850,7 @@ func (it *MultiAggregateRateLimiterOwnershipTransferRequestedIterator) Next() bo
 
 	select {
 	case log := <-it.logs:
-		it.Event = new(MultiAggregateRateLimiterOwnershipTransferRequested)
+		it.Event = new(MultiAggregateRateLimiterFeeQuoterSet)
 		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
 			it.fail = err
 			return false
@@ -865,51 +865,32 @@ func (it *MultiAggregateRateLimiterOwnershipTransferRequestedIterator) Next() bo
 	}
 }
 
-func (it *MultiAggregateRateLimiterOwnershipTransferRequestedIterator) Error() error {
+func (it *MultiAggregateRateLimiterFeeQuoterSetIterator) Error() error {
 	return it.fail
 }
 
-func (it *MultiAggregateRateLimiterOwnershipTransferRequestedIterator) Close() error {
+func (it *MultiAggregateRateLimiterFeeQuoterSetIterator) Close() error {
 	it.sub.Unsubscribe()
 	return nil
 }
 
-type MultiAggregateRateLimiterOwnershipTransferRequested struct {
-	From common.Address
-	To   common.Address
-	Raw  types.Log
+type MultiAggregateRateLimiterFeeQuoterSet struct {
+	NewFeeQuoter common.Address
+	Raw          types.Log
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*MultiAggregateRateLimiterOwnershipTransferRequestedIterator, error) {
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) FilterFeeQuoterSet(opts *bind.FilterOpts) (*MultiAggregateRateLimiterFeeQuoterSetIterator, error) {
 
-	var fromRule []interface{}
-	for _, fromItem := range from {
-		fromRule = append(fromRule, fromItem)
-	}
-	var toRule []interface{}
-	for _, toItem := range to {
-		toRule = append(toRule, toItem)
-	}
-
-	logs, sub, err := _MultiAggregateRateLimiter.contract.FilterLogs(opts, "OwnershipTransferRequested", fromRule, toRule)
+	logs, sub, err := _MultiAggregateRateLimiter.contract.FilterLogs(opts, "FeeQuoterSet")
 	if err != nil {
 		return nil, err
 	}
-	return &MultiAggregateRateLimiterOwnershipTransferRequestedIterator{contract: _MultiAggregateRateLimiter.contract, event: "OwnershipTransferRequested", logs: logs, sub: sub}, nil
+	return &MultiAggregateRateLimiterFeeQuoterSetIterator{contract: _MultiAggregateRateLimiter.contract, event: "FeeQuoterSet", logs: logs, sub: sub}, nil
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *MultiAggregateRateLimiterOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
-
-	var fromRule []interface{}
-	for _, fromItem := range from {
-		fromRule = append(fromRule, fromItem)
-	}
-	var toRule []interface{}
-	for _, toItem := range to {
-		toRule = append(toRule, toItem)
-	}
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchFeeQuoterSet(opts *bind.WatchOpts, sink chan<- *MultiAggregateRateLimiterFeeQuoterSet) (event.Subscription, error) {
 
-	logs, sub, err := _MultiAggregateRateLimiter.contract.WatchLogs(opts, "OwnershipTransferRequested", fromRule, toRule)
+	logs, sub, err := _MultiAggregateRateLimiter.contract.WatchLogs(opts, "FeeQuoterSet")
 	if err != nil {
 		return nil, err
 	}
@@ -919,8 +900,8 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchOwners
 			select {
 			case log := <-logs:
 
-				event := new(MultiAggregateRateLimiterOwnershipTransferRequested)
-				if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "OwnershipTransferRequested", log); err != nil {
+				event := new(MultiAggregateRateLimiterFeeQuoterSet)
+				if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "FeeQuoterSet", log); err != nil {
 					return err
 				}
 				event.Raw = log
@@ -941,17 +922,17 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchOwners
 	}), nil
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) ParseOwnershipTransferRequested(log types.Log) (*MultiAggregateRateLimiterOwnershipTransferRequested, error) {
-	event := new(MultiAggregateRateLimiterOwnershipTransferRequested)
-	if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "OwnershipTransferRequested", log); err != nil {
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) ParseFeeQuoterSet(log types.Log) (*MultiAggregateRateLimiterFeeQuoterSet, error) {
+	event := new(MultiAggregateRateLimiterFeeQuoterSet)
+	if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "FeeQuoterSet", log); err != nil {
 		return nil, err
 	}
 	event.Raw = log
 	return event, nil
 }
 
-type MultiAggregateRateLimiterOwnershipTransferredIterator struct {
-	Event *MultiAggregateRateLimiterOwnershipTransferred
+type MultiAggregateRateLimiterOwnershipTransferRequestedIterator struct {
+	Event *MultiAggregateRateLimiterOwnershipTransferRequested
 
 	contract *bind.BoundContract
 	event    string
@@ -962,7 +943,7 @@ type MultiAggregateRateLimiterOwnershipTransferredIterator struct {
 	fail error
 }
 
-func (it *MultiAggregateRateLimiterOwnershipTransferredIterator) Next() bool {
+func (it *MultiAggregateRateLimiterOwnershipTransferRequestedIterator) Next() bool {
 
 	if it.fail != nil {
 		return false
@@ -971,7 +952,7 @@ func (it *MultiAggregateRateLimiterOwnershipTransferredIterator) Next() bool {
 	if it.done {
 		select {
 		case log := <-it.logs:
-			it.Event = new(MultiAggregateRateLimiterOwnershipTransferred)
+			it.Event = new(MultiAggregateRateLimiterOwnershipTransferRequested)
 			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
 				it.fail = err
 				return false
@@ -986,7 +967,7 @@ func (it *MultiAggregateRateLimiterOwnershipTransferredIterator) Next() bool {
 
 	select {
 	case log := <-it.logs:
-		it.Event = new(MultiAggregateRateLimiterOwnershipTransferred)
+		it.Event = new(MultiAggregateRateLimiterOwnershipTransferRequested)
 		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
 			it.fail = err
 			return false
@@ -1001,22 +982,22 @@ func (it *MultiAggregateRateLimiterOwnershipTransferredIterator) Next() bool {
 	}
 }
 
-func (it *MultiAggregateRateLimiterOwnershipTransferredIterator) Error() error {
+func (it *MultiAggregateRateLimiterOwnershipTransferRequestedIterator) Error() error {
 	return it.fail
 }
 
-func (it *MultiAggregateRateLimiterOwnershipTransferredIterator) Close() error {
+func (it *MultiAggregateRateLimiterOwnershipTransferRequestedIterator) Close() error {
 	it.sub.Unsubscribe()
 	return nil
 }
 
-type MultiAggregateRateLimiterOwnershipTransferred struct {
+type MultiAggregateRateLimiterOwnershipTransferRequested struct {
 	From common.Address
 	To   common.Address
 	Raw  types.Log
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*MultiAggregateRateLimiterOwnershipTransferredIterator, error) {
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*MultiAggregateRateLimiterOwnershipTransferRequestedIterator, error) {
 
 	var fromRule []interface{}
 	for _, fromItem := range from {
@@ -1027,14 +1008,14 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) FilterOwner
 		toRule = append(toRule, toItem)
 	}
 
-	logs, sub, err := _MultiAggregateRateLimiter.contract.FilterLogs(opts, "OwnershipTransferred", fromRule, toRule)
+	logs, sub, err := _MultiAggregateRateLimiter.contract.FilterLogs(opts, "OwnershipTransferRequested", fromRule, toRule)
 	if err != nil {
 		return nil, err
 	}
-	return &MultiAggregateRateLimiterOwnershipTransferredIterator{contract: _MultiAggregateRateLimiter.contract, event: "OwnershipTransferred", logs: logs, sub: sub}, nil
+	return &MultiAggregateRateLimiterOwnershipTransferRequestedIterator{contract: _MultiAggregateRateLimiter.contract, event: "OwnershipTransferRequested", logs: logs, sub: sub}, nil
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *MultiAggregateRateLimiterOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *MultiAggregateRateLimiterOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 
 	var fromRule []interface{}
 	for _, fromItem := range from {
@@ -1045,7 +1026,7 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchOwners
 		toRule = append(toRule, toItem)
 	}
 
-	logs, sub, err := _MultiAggregateRateLimiter.contract.WatchLogs(opts, "OwnershipTransferred", fromRule, toRule)
+	logs, sub, err := _MultiAggregateRateLimiter.contract.WatchLogs(opts, "OwnershipTransferRequested", fromRule, toRule)
 	if err != nil {
 		return nil, err
 	}
@@ -1055,8 +1036,8 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchOwners
 			select {
 			case log := <-logs:
 
-				event := new(MultiAggregateRateLimiterOwnershipTransferred)
-				if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "OwnershipTransferred", log); err != nil {
+				event := new(MultiAggregateRateLimiterOwnershipTransferRequested)
+				if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "OwnershipTransferRequested", log); err != nil {
 					return err
 				}
 				event.Raw = log
@@ -1077,17 +1058,17 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchOwners
 	}), nil
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) ParseOwnershipTransferred(log types.Log) (*MultiAggregateRateLimiterOwnershipTransferred, error) {
-	event := new(MultiAggregateRateLimiterOwnershipTransferred)
-	if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "OwnershipTransferred", log); err != nil {
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) ParseOwnershipTransferRequested(log types.Log) (*MultiAggregateRateLimiterOwnershipTransferRequested, error) {
+	event := new(MultiAggregateRateLimiterOwnershipTransferRequested)
+	if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "OwnershipTransferRequested", log); err != nil {
 		return nil, err
 	}
 	event.Raw = log
 	return event, nil
 }
 
-type MultiAggregateRateLimiterPriceRegistrySetIterator struct {
-	Event *MultiAggregateRateLimiterPriceRegistrySet
+type MultiAggregateRateLimiterOwnershipTransferredIterator struct {
+	Event *MultiAggregateRateLimiterOwnershipTransferred
 
 	contract *bind.BoundContract
 	event    string
@@ -1098,7 +1079,7 @@ type MultiAggregateRateLimiterPriceRegistrySetIterator struct {
 	fail error
 }
 
-func (it *MultiAggregateRateLimiterPriceRegistrySetIterator) Next() bool {
+func (it *MultiAggregateRateLimiterOwnershipTransferredIterator) Next() bool {
 
 	if it.fail != nil {
 		return false
@@ -1107,7 +1088,7 @@ func (it *MultiAggregateRateLimiterPriceRegistrySetIterator) Next() bool {
 	if it.done {
 		select {
 		case log := <-it.logs:
-			it.Event = new(MultiAggregateRateLimiterPriceRegistrySet)
+			it.Event = new(MultiAggregateRateLimiterOwnershipTransferred)
 			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
 				it.fail = err
 				return false
@@ -1122,7 +1103,7 @@ func (it *MultiAggregateRateLimiterPriceRegistrySetIterator) Next() bool {
 
 	select {
 	case log := <-it.logs:
-		it.Event = new(MultiAggregateRateLimiterPriceRegistrySet)
+		it.Event = new(MultiAggregateRateLimiterOwnershipTransferred)
 		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
 			it.fail = err
 			return false
@@ -1137,32 +1118,51 @@ func (it *MultiAggregateRateLimiterPriceRegistrySetIterator) Next() bool {
 	}
 }
 
-func (it *MultiAggregateRateLimiterPriceRegistrySetIterator) Error() error {
+func (it *MultiAggregateRateLimiterOwnershipTransferredIterator) Error() error {
 	return it.fail
 }
 
-func (it *MultiAggregateRateLimiterPriceRegistrySetIterator) Close() error {
+func (it *MultiAggregateRateLimiterOwnershipTransferredIterator) Close() error {
 	it.sub.Unsubscribe()
 	return nil
 }
 
-type MultiAggregateRateLimiterPriceRegistrySet struct {
-	NewPriceRegistry common.Address
-	Raw              types.Log
+type MultiAggregateRateLimiterOwnershipTransferred struct {
+	From common.Address
+	To   common.Address
+	Raw  types.Log
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) FilterPriceRegistrySet(opts *bind.FilterOpts) (*MultiAggregateRateLimiterPriceRegistrySetIterator, error) {
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*MultiAggregateRateLimiterOwnershipTransferredIterator, error) {
+
+	var fromRule []interface{}
+	for _, fromItem := range from {
+		fromRule = append(fromRule, fromItem)
+	}
+	var toRule []interface{}
+	for _, toItem := range to {
+		toRule = append(toRule, toItem)
+	}
 
-	logs, sub, err := _MultiAggregateRateLimiter.contract.FilterLogs(opts, "PriceRegistrySet")
+	logs, sub, err := _MultiAggregateRateLimiter.contract.FilterLogs(opts, "OwnershipTransferred", fromRule, toRule)
 	if err != nil {
 		return nil, err
 	}
-	return &MultiAggregateRateLimiterPriceRegistrySetIterator{contract: _MultiAggregateRateLimiter.contract, event: "PriceRegistrySet", logs: logs, sub: sub}, nil
+	return &MultiAggregateRateLimiterOwnershipTransferredIterator{contract: _MultiAggregateRateLimiter.contract, event: "OwnershipTransferred", logs: logs, sub: sub}, nil
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchPriceRegistrySet(opts *bind.WatchOpts, sink chan<- *MultiAggregateRateLimiterPriceRegistrySet) (event.Subscription, error) {
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *MultiAggregateRateLimiterOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
+
+	var fromRule []interface{}
+	for _, fromItem := range from {
+		fromRule = append(fromRule, fromItem)
+	}
+	var toRule []interface{}
+	for _, toItem := range to {
+		toRule = append(toRule, toItem)
+	}
 
-	logs, sub, err := _MultiAggregateRateLimiter.contract.WatchLogs(opts, "PriceRegistrySet")
+	logs, sub, err := _MultiAggregateRateLimiter.contract.WatchLogs(opts, "OwnershipTransferred", fromRule, toRule)
 	if err != nil {
 		return nil, err
 	}
@@ -1172,8 +1172,8 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchPriceR
 			select {
 			case log := <-logs:
 
-				event := new(MultiAggregateRateLimiterPriceRegistrySet)
-				if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "PriceRegistrySet", log); err != nil {
+				event := new(MultiAggregateRateLimiterOwnershipTransferred)
+				if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "OwnershipTransferred", log); err != nil {
 					return err
 				}
 				event.Raw = log
@@ -1194,9 +1194,9 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) WatchPriceR
 	}), nil
 }
 
-func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) ParsePriceRegistrySet(log types.Log) (*MultiAggregateRateLimiterPriceRegistrySet, error) {
-	event := new(MultiAggregateRateLimiterPriceRegistrySet)
-	if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "PriceRegistrySet", log); err != nil {
+func (_MultiAggregateRateLimiter *MultiAggregateRateLimiterFilterer) ParseOwnershipTransferred(log types.Log) (*MultiAggregateRateLimiterOwnershipTransferred, error) {
+	event := new(MultiAggregateRateLimiterOwnershipTransferred)
+	if err := _MultiAggregateRateLimiter.contract.UnpackLog(event, "OwnershipTransferred", log); err != nil {
 		return nil, err
 	}
 	event.Raw = log
@@ -1699,12 +1699,12 @@ func (_MultiAggregateRateLimiter *MultiAggregateRateLimiter) ParseLog(log types.
 		return _MultiAggregateRateLimiter.ParseAuthorizedCallerRemoved(log)
 	case _MultiAggregateRateLimiter.abi.Events["ConfigChanged"].ID:
 		return _MultiAggregateRateLimiter.ParseConfigChanged(log)
+	case _MultiAggregateRateLimiter.abi.Events["FeeQuoterSet"].ID:
+		return _MultiAggregateRateLimiter.ParseFeeQuoterSet(log)
 	case _MultiAggregateRateLimiter.abi.Events["OwnershipTransferRequested"].ID:
 		return _MultiAggregateRateLimiter.ParseOwnershipTransferRequested(log)
 	case _MultiAggregateRateLimiter.abi.Events["OwnershipTransferred"].ID:
 		return _MultiAggregateRateLimiter.ParseOwnershipTransferred(log)
-	case _MultiAggregateRateLimiter.abi.Events["PriceRegistrySet"].ID:
-		return _MultiAggregateRateLimiter.ParsePriceRegistrySet(log)
 	case _MultiAggregateRateLimiter.abi.Events["RateLimiterConfigUpdated"].ID:
 		return _MultiAggregateRateLimiter.ParseRateLimiterConfigUpdated(log)
 	case _MultiAggregateRateLimiter.abi.Events["TokenAggregateRateLimitAdded"].ID:
@@ -1731,6 +1731,10 @@ func (MultiAggregateRateLimiterConfigChanged) Topic() common.Hash {
 	return common.HexToHash("0x9ea3374b67bf275e6bb9c8ae68f9cae023e1c528b4b27e092f0bb209d3531c19")
 }
 
+func (MultiAggregateRateLimiterFeeQuoterSet) Topic() common.Hash {
+	return common.HexToHash("0x7c737a8eddf62436489aa3600ed26e75e0a58b0f8c0d266bbcee64358c39fdac")
+}
+
 func (MultiAggregateRateLimiterOwnershipTransferRequested) Topic() common.Hash {
 	return common.HexToHash("0xed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae1278")
 }
@@ -1739,10 +1743,6 @@ func (MultiAggregateRateLimiterOwnershipTransferred) Topic() common.Hash {
 	return common.HexToHash("0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0")
 }
 
-func (MultiAggregateRateLimiterPriceRegistrySet) Topic() common.Hash {
-	return common.HexToHash("0xdeaac1a8daeabcc5254b10b54edf3678fdfcd1cea89fe9d364b6285f6ace2df9")
-}
-
 func (MultiAggregateRateLimiterRateLimiterConfigUpdated) Topic() common.Hash {
 	return common.HexToHash("0xf14a5415ce6988a9e870a85fff0b9d7b7dd79bbc228cb63cad610daf6f7b6b97")
 }
@@ -1772,7 +1772,7 @@ type MultiAggregateRateLimiterInterface interface {
 
 		error)
 
-	GetPriceRegistry(opts *bind.CallOpts) (common.Address, error)
+	GetFeeQuoter(opts *bind.CallOpts) (common.Address, error)
 
 	Owner(opts *bind.CallOpts) (common.Address, error)
 
@@ -1788,7 +1788,7 @@ type MultiAggregateRateLimiterInterface interface {
 
 	OnOutboundMessage(opts *bind.TransactOpts, destChainSelector uint64, message ClientEVM2AnyMessage) (*types.Transaction, error)
 
-	SetPriceRegistry(opts *bind.TransactOpts, newPriceRegistry common.Address) (*types.Transaction, error)
+	SetFeeQuoter(opts *bind.TransactOpts, newFeeQuoter common.Address) (*types.Transaction, error)
 
 	TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error)
 
@@ -1812,6 +1812,12 @@ type MultiAggregateRateLimiterInterface interface {
 
 	ParseConfigChanged(log types.Log) (*MultiAggregateRateLimiterConfigChanged, error)
 
+	FilterFeeQuoterSet(opts *bind.FilterOpts) (*MultiAggregateRateLimiterFeeQuoterSetIterator, error)
+
+	WatchFeeQuoterSet(opts *bind.WatchOpts, sink chan<- *MultiAggregateRateLimiterFeeQuoterSet) (event.Subscription, error)
+
+	ParseFeeQuoterSet(log types.Log) (*MultiAggregateRateLimiterFeeQuoterSet, error)
+
 	FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*MultiAggregateRateLimiterOwnershipTransferRequestedIterator, error)
 
 	WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *MultiAggregateRateLimiterOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error)
@@ -1824,12 +1830,6 @@ type MultiAggregateRateLimiterInterface interface {
 
 	ParseOwnershipTransferred(log types.Log) (*MultiAggregateRateLimiterOwnershipTransferred, error)
 
-	FilterPriceRegistrySet(opts *bind.FilterOpts) (*MultiAggregateRateLimiterPriceRegistrySetIterator, error)
-
-	WatchPriceRegistrySet(opts *bind.WatchOpts, sink chan<- *MultiAggregateRateLimiterPriceRegistrySet) (event.Subscription, error)
-
-	ParsePriceRegistrySet(log types.Log) (*MultiAggregateRateLimiterPriceRegistrySet, error)
-
 	FilterRateLimiterConfigUpdated(opts *bind.FilterOpts, remoteChainSelector []uint64) (*MultiAggregateRateLimiterRateLimiterConfigUpdatedIterator, error)
 
 	WatchRateLimiterConfigUpdated(opts *bind.WatchOpts, sink chan<- *MultiAggregateRateLimiterRateLimiterConfigUpdated, remoteChainSelector []uint64) (event.Subscription, error)
diff --git a/core/gethwrappers/ccip/generated/offramp/offramp.go b/core/gethwrappers/ccip/generated/offramp/offramp.go
index 72917cf943..65795e0626 100644
--- a/core/gethwrappers/ccip/generated/offramp/offramp.go
+++ b/core/gethwrappers/ccip/generated/offramp/offramp.go
@@ -83,6 +83,7 @@ type InternalRampTokenAmount struct {
 	DestTokenAddress  []byte
 	ExtraData         []byte
 	Amount            *big.Int
+	DestExecData      []byte
 }
 
 type InternalTokenPriceUpdate struct {
@@ -118,7 +119,7 @@ type OffRampCommitReport struct {
 }
 
 type OffRampDynamicConfig struct {
-	PriceRegistry                           common.Address
+	FeeQuoter                               common.Address
 	PermissionLessExecutionThresholdSeconds uint32
 	MaxTokenTransferGas                     uint32
 	MaxPoolReleaseOrMintGas                 uint32
@@ -163,8 +164,8 @@ type OffRampUnblessedRoot struct {
 }
 
 var OffRampMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"}],\"internalType\":\"structOffRamp.StaticConfig\",\"name\":\"staticConfig\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"priceRegistry\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"permissionLessExecutionThresholdSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxTokenTransferGas\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPoolReleaseOrMintGas\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"}],\"internalType\":\"structOffRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"internalType\":\"structOffRamp.SourceChainConfigArgs[]\",\"name\":\"sourceChainConfigs\",\"type\":\"tuple[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"CanOnlySelfCall\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"expected\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"actual\",\"type\":\"bytes32\"}],\"name\":\"ConfigDigestMismatch\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"CursedByRMN\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"EmptyReport\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"err\",\"type\":\"bytes\"}],\"name\":\"ExecutionError\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"expected\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"actual\",\"type\":\"uint256\"}],\"name\":\"ForkedChain\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"enumMultiOCR3Base.InvalidConfigErrorType\",\"name\":\"errorType\",\"type\":\"uint8\"}],\"name\":\"InvalidConfig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"expected\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"got\",\"type\":\"uint256\"}],\"name\":\"InvalidDataLength\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"encodedAddress\",\"type\":\"bytes\"}],\"name\":\"InvalidEVMAddress\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"}],\"name\":\"InvalidInterval\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"index\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"newLimit\",\"type\":\"uint256\"}],\"name\":\"InvalidManualExecutionGasLimit\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"messageDestChainSelector\",\"type\":\"uint64\"}],\"name\":\"InvalidMessageDestChainSelector\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"enumInternal.MessageExecutionState\",\"name\":\"newState\",\"type\":\"uint8\"}],\"name\":\"InvalidNewState\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidProof\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidRoot\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"InvalidStaticConfig\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"LeavesCannotBeEmpty\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ManualExecutionGasLimitMismatch\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"ManualExecutionNotYetEnabled\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"errorReason\",\"type\":\"bytes\"}],\"name\":\"MessageValidationError\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"NonUniqueSignatures\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"notPool\",\"type\":\"address\"}],\"name\":\"NotACompatiblePool\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OracleCannotBeZeroAddress\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"err\",\"type\":\"bytes\"}],\"name\":\"ReceiverError\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountReleased\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"balancePre\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"balancePost\",\"type\":\"uint256\"}],\"name\":\"ReleaseOrMintBalanceMismatch\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"name\":\"RootAlreadyCommitted\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"RootNotCommitted\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"SignaturesOutOfRegistration\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"SourceChainNotEnabled\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"StaleCommitReport\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"ocrPluginType\",\"type\":\"uint8\"}],\"name\":\"StaticConfigCannotBeChanged\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"TokenDataMismatch\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"err\",\"type\":\"bytes\"}],\"name\":\"TokenHandlingError\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnauthorizedSigner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnauthorizedTransmitter\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnexpectedTokenData\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"expected\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"actual\",\"type\":\"uint256\"}],\"name\":\"WrongMessageLength\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WrongNumberOfSignatures\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ZeroAddressNotAllowed\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ZeroChainSelectorNotAllowed\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"AlreadyAttempted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"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\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.MerkleRoot[]\",\"name\":\"merkleRoots\",\"type\":\"tuple[]\"}],\"indexed\":false,\"internalType\":\"structOffRamp.CommitReport\",\"name\":\"report\",\"type\":\"tuple\"}],\"name\":\"CommitReportAccepted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"ocrPluginType\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"transmitters\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"F\",\"type\":\"uint8\"}],\"name\":\"ConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"priceRegistry\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"permissionLessExecutionThresholdSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxTokenTransferGas\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPoolReleaseOrMintGas\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structOffRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"}],\"name\":\"DynamicConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"enumInternal.MessageExecutionState\",\"name\":\"state\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"returnData\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"gasUsed\",\"type\":\"uint256\"}],\"name\":\"ExecutionStateChanged\",\"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\":false,\"internalType\":\"bytes32\",\"name\":\"root\",\"type\":\"bytes32\"}],\"name\":\"RootRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"SkippedAlreadyExecutedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint64\",\"name\":\"minSeqNr\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"indexed\":false,\"internalType\":\"structOffRamp.SourceChainConfig\",\"name\":\"sourceConfig\",\"type\":\"tuple\"}],\"name\":\"SourceChainConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"SourceChainSelectorAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structOffRamp.StaticConfig\",\"name\":\"staticConfig\",\"type\":\"tuple\"}],\"name\":\"StaticConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint8\",\"name\":\"ocrPluginType\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"Transmitted\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"internalType\":\"structOffRamp.SourceChainConfigArgs[]\",\"name\":\"sourceChainConfigUpdates\",\"type\":\"tuple[]\"}],\"name\":\"applySourceChainConfigUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"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\":\"destTokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structClient.Any2EVMMessage\",\"name\":\"\",\"type\":\"tuple\"}],\"name\":\"ccipReceive\",\"outputs\":[],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32[3]\",\"name\":\"reportContext\",\"type\":\"bytes32[3]\"},{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"},{\"internalType\":\"bytes32[]\",\"name\":\"rs\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes32[]\",\"name\":\"ss\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes32\",\"name\":\"rawVs\",\"type\":\"bytes32\"}],\"name\":\"commit\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32[3]\",\"name\":\"reportContext\",\"type\":\"bytes32[3]\"},{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"}],\"name\":\"execute\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.Any2EVMRampMessage\",\"name\":\"message\",\"type\":\"tuple\"},{\"internalType\":\"bytes[]\",\"name\":\"offchainTokenData\",\"type\":\"bytes[]\"}],\"name\":\"executeSingleMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getDynamicConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"priceRegistry\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"permissionLessExecutionThresholdSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxTokenTransferGas\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPoolReleaseOrMintGas\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"}],\"internalType\":\"structOffRamp.DynamicConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"getExecutionState\",\"outputs\":[{\"internalType\":\"enumInternal.MessageExecutionState\",\"name\":\"\",\"type\":\"uint8\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getLatestPriceSequenceNumber\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"root\",\"type\":\"bytes32\"}],\"name\":\"getMerkleRoot\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"getSourceChainConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint64\",\"name\":\"minSeqNr\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"internalType\":\"structOffRamp.SourceChainConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getStaticConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"}],\"internalType\":\"structOffRamp.StaticConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"root\",\"type\":\"bytes32\"}],\"name\":\"isBlessed\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"ocrPluginType\",\"type\":\"uint8\"}],\"name\":\"latestConfigDetails\",\"outputs\":[{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"internalType\":\"uint8\",\"name\":\"F\",\"type\":\"uint8\"},{\"internalType\":\"uint8\",\"name\":\"n\",\"type\":\"uint8\"},{\"internalType\":\"bool\",\"name\":\"isSignatureVerificationEnabled\",\"type\":\"bool\"}],\"internalType\":\"structMultiOCR3Base.ConfigInfo\",\"name\":\"configInfo\",\"type\":\"tuple\"},{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"transmitters\",\"type\":\"address[]\"}],\"internalType\":\"structMultiOCR3Base.OCRConfig\",\"name\":\"ocrConfig\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.Any2EVMRampMessage[]\",\"name\":\"messages\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes[][]\",\"name\":\"offchainTokenData\",\"type\":\"bytes[][]\"},{\"internalType\":\"bytes32[]\",\"name\":\"proofs\",\"type\":\"bytes32[]\"},{\"internalType\":\"uint256\",\"name\":\"proofFlagBits\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.ExecutionReportSingleChain[]\",\"name\":\"reports\",\"type\":\"tuple[]\"},{\"internalType\":\"uint256[][]\",\"name\":\"gasLimitOverrides\",\"type\":\"uint256[][]\"}],\"name\":\"manuallyExecute\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.UnblessedRoot[]\",\"name\":\"rootToReset\",\"type\":\"tuple[]\"}],\"name\":\"resetUnblessedRoots\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"priceRegistry\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"permissionLessExecutionThresholdSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxTokenTransferGas\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPoolReleaseOrMintGas\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"}],\"internalType\":\"structOffRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"}],\"name\":\"setDynamicConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"internalType\":\"uint8\",\"name\":\"ocrPluginType\",\"type\":\"uint8\"},{\"internalType\":\"uint8\",\"name\":\"F\",\"type\":\"uint8\"},{\"internalType\":\"bool\",\"name\":\"isSignatureVerificationEnabled\",\"type\":\"bool\"},{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"transmitters\",\"type\":\"address[]\"}],\"internalType\":\"structMultiOCR3Base.OCRConfigArgs[]\",\"name\":\"ocrConfigArgs\",\"type\":\"tuple[]\"}],\"name\":\"setOCR3Configs\",\"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\"}]",
-	Bin: "0x6101206040523480156200001257600080fd5b5060405162006bdd38038062006bdd8339810160408190526200003591620008c7565b33806000816200008c5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000bf57620000bf81620001fa565b5050466080525060208301516001600160a01b03161580620000ec575060408301516001600160a01b0316155b8062000103575060608301516001600160a01b0316155b1562000122576040516342bcdf7f60e11b815260040160405180910390fd5b82516001600160401b03166000036200014e5760405163c656089560e01b815260040160405180910390fd5b82516001600160401b0390811660a052602080850180516001600160a01b0390811660c05260408088018051831660e0526060808a01805185166101005283518b519098168852945184169587019590955251821690850152905116908201527f683eb52ee924eb817377cfa8f41f238f4bb7a877da5267869dfffbad85f564d89060800160405180910390a1620001e682620002a5565b620001f181620003c1565b50505062000c67565b336001600160a01b03821603620002545760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000083565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b80516001600160a01b0316620002ce576040516342bcdf7f60e11b815260040160405180910390fd5b80516004805460208085018051604080880180516060808b0180516001600160a01b039b8c166001600160c01b0319909a168a17600160a01b63ffffffff98891602176001600160c01b0316600160c01b948816949094026001600160e01b031693909317600160e01b93871693909302929092179098556080808b018051600580546001600160a01b031916918d169190911790558451988952955185169688019690965290518316918601919091525116938301939093529151909216908201527fa55bd56595c45f517e5967a3067f3dca684445a3080e7c04a4e0d5a40cda627d9060a00160405180910390a150565b60005b815181101562000666576000828281518110620003e557620003e562000a1d565b60200260200101519050600081602001519050806001600160401b0316600003620004235760405163c656089560e01b815260040160405180910390fd5b81516001600160a01b03166200044c576040516342bcdf7f60e11b815260040160405180910390fd5b6001600160401b0381166000908152600660205260408120600181018054919291620004789062000a33565b80601f0160208091040260200160405190810160405280929190818152602001828054620004a69062000a33565b8015620004f75780601f10620004cb57610100808354040283529160200191620004f7565b820191906000526020600020905b815481529060010190602001808311620004d957829003601f168201915b5050505050905060008460600151905081516000036200059e57805160000362000534576040516342bcdf7f60e11b815260040160405180910390fd5b6001830162000544828262000ac4565b508254600160a81b600160e81b031916600160a81b1783556040516001600160401b03851681527ff4c1390c70e5c0f491ae1ccbc06f9117cbbadf2767b247b3bc203280f24c0fb99060200160405180910390a1620005d9565b8080519060200120828051906020012014620005d95760405163c39a620560e01b81526001600160401b038516600482015260240162000083565b604080860151845487516001600160a01b03166001600160a01b0319921515600160a01b02929092166001600160a81b031990911617178455516001600160401b038516907f49f51971edd25182e97182d6ea372a0488ce2ab639f6a3a7ab4df0d2636fe56b906200064d90869062000b90565b60405180910390a25050505050806001019050620003c4565b5050565b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b0381118282101715620006a557620006a56200066a565b60405290565b604051601f8201601f191681016001600160401b0381118282101715620006d657620006d66200066a565b604052919050565b80516001600160401b0381168114620006f657600080fd5b919050565b6001600160a01b03811681146200071157600080fd5b50565b805163ffffffff81168114620006f657600080fd5b6000601f83601f8401126200073d57600080fd5b825160206001600160401b03808311156200075c576200075c6200066a565b8260051b6200076d838201620006ab565b93845286810183019383810190898611156200078857600080fd5b84890192505b85831015620008ba57825184811115620007a85760008081fd5b89016080601f19828d038101821315620007c25760008081fd5b620007cc62000680565b88840151620007db81620006fb565b81526040620007ec858201620006de565b8a8301526060808601518015158114620008065760008081fd5b838301529385015193898511156200081e5760008081fd5b84860195508f603f8701126200083657600094508485fd5b8a8601519450898511156200084f576200084f6200066a565b620008608b858f88011601620006ab565b93508484528f82868801011115620008785760008081fd5b60005b8581101562000898578681018301518582018d01528b016200087b565b5060009484018b0194909452509182015283525091840191908401906200078e565b9998505050505050505050565b6000806000838503610140811215620008df57600080fd5b6080811215620008ee57600080fd5b620008f862000680565b6200090386620006de565b815260208601516200091581620006fb565b602082015260408601516200092a81620006fb565b604082015260608601516200093f81620006fb565b6060820152935060a0607f19820112156200095957600080fd5b5060405160a081016001600160401b0380821183831017156200098057620009806200066a565b81604052608087015191506200099682620006fb565b818352620009a760a0880162000714565b6020840152620009ba60c0880162000714565b6040840152620009cd60e0880162000714565b60608401526101008701519150620009e582620006fb565b608083018290526101208701519294508083111562000a0357600080fd5b505062000a138682870162000729565b9150509250925092565b634e487b7160e01b600052603260045260246000fd5b600181811c9082168062000a4857607f821691505b60208210810362000a6957634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111562000abf576000816000526020600020601f850160051c8101602086101562000a9a5750805b601f850160051c820191505b8181101562000abb5782815560010162000aa6565b5050505b505050565b81516001600160401b0381111562000ae05762000ae06200066a565b62000af88162000af1845462000a33565b8462000a6f565b602080601f83116001811462000b30576000841562000b175750858301515b600019600386901b1c1916600185901b17855562000abb565b600085815260208120601f198616915b8281101562000b615788860151825594840194600190910190840162000b40565b508582101562000b805787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b602080825282546001600160a01b0381168383015260a081901c60ff161515604084015260a81c6001600160401b0316606083015260808083015260018084018054600093929190849062000be58162000a33565b8060a089015260c0600183166000811462000c09576001811462000c265762000c58565b60ff19841660c08b015260c083151560051b8b0101945062000c58565b85600052602060002060005b8481101562000c4f5781548c820185015290880190890162000c32565b8b0160c0019550505b50929998505050505050505050565b60805160a05160c05160e05161010051615f0762000cd6600039600081816102530152612c120152600081816102240152612ef80152600081816101f50152818161142f01526118400152600081816101c50152612801015260008181611dce0152611e1a0152615f076000f3fe608060405234801561001057600080fd5b50600436106101775760003560e01c806385572ffb116100d8578063d2a15d351161008c578063f2fde38b11610066578063f2fde38b14610583578063f716f99f14610596578063ff888fb1146105a957600080fd5b8063d2a15d351461053d578063e9d68a8e14610550578063ece670b61461057057600080fd5b8063991a5018116100bd578063991a5018146104c5578063c673e584146104d8578063ccd37ba3146104f857600080fd5b806385572ffb1461049c5780638da5cb5b146104aa57600080fd5b80633f4b04aa1161012f5780637437ff9f116101145780637437ff9f1461038557806379ba5097146104815780637d4eef601461048957600080fd5b80633f4b04aa146103495780635e36480c1461036557600080fd5b8063181f5a7711610160578063181f5a77146102da5780632d04ab7614610323578063311cd5131461033657600080fd5b806304666f9c1461017c57806306285c6914610191575b600080fd5b61018f61018a3660046140b3565b6105cc565b005b61028360408051608081018252600080825260208201819052918101829052606081019190915260405180608001604052807f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff1681526020017f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031681526020017f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031681526020017f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316815250905090565b6040516102d19190815167ffffffffffffffff1681526020808301516001600160a01b0390811691830191909152604080840151821690830152606092830151169181019190915260800190565b60405180910390f35b6103166040518060400160405280601181526020017f4f666652616d7020312e362e302d64657600000000000000000000000000000081525081565b6040516102d19190614222565b61018f6103313660046142cd565b6105e0565b61018f610344366004614380565b6109c0565b60095460405167ffffffffffffffff90911681526020016102d1565b6103786103733660046143d4565b610a29565b6040516102d19190614431565b6104246040805160a081018252600080825260208201819052918101829052606081018290526080810191909152506040805160a0810182526004546001600160a01b03808216835263ffffffff600160a01b83048116602085015278010000000000000000000000000000000000000000000000008304811694840194909452600160e01b9091049092166060820152600554909116608082015290565b6040516102d19190600060a0820190506001600160a01b03808451168352602084015163ffffffff808216602086015280604087015116604086015280606087015116606086015250508060808501511660808401525092915050565b61018f610a7f565b61018f610497366004614986565b610b3d565b61018f610177366004614ab1565b6000546040516001600160a01b0390911681526020016102d1565b61018f6104d3366004614b00565b610cdd565b6104eb6104e6366004614b85565b610cee565b6040516102d19190614be5565b61052f610506366004614c5a565b67ffffffffffffffff919091166000908152600860209081526040808320938352929052205490565b6040519081526020016102d1565b61018f61054b366004614c84565b610e4c565b61056361055e366004614cf9565b610f06565b6040516102d19190614d14565b61018f61057e366004614d62565b611013565b61018f610591366004614dbe565b611386565b61018f6105a4366004614e43565b611397565b6105bc6105b7366004614f81565b6113d9565b60405190151581526020016102d1565b6105d461149a565b6105dd816114f6565b50565b60006105ee8789018961510a565b8051515190915015158061060757508051602001515115155b156107075760095460208a01359067ffffffffffffffff808316911610156106c6576009805467ffffffffffffffff191667ffffffffffffffff83161790556004805483516040517f3937306f0000000000000000000000000000000000000000000000000000000081526001600160a01b0390921692633937306f9261068f929101615348565b600060405180830381600087803b1580156106a957600080fd5b505af11580156106bd573d6000803e3d6000fd5b50505050610705565b816020015151600003610705576040517f2261116700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b505b60005b8160200151518110156109095760008260200151828151811061072f5761072f615275565b6020026020010151905060008160000151905061074b816117f4565b6000610756826118f6565b602084015151815491925067ffffffffffffffff908116600160a81b9092041614158061079a575060208084015190810151905167ffffffffffffffff9182169116115b156107e357825160208401516040517feefb0cac0000000000000000000000000000000000000000000000000000000081526107da92919060040161535b565b60405180910390fd5b60408301518061081f576040517f504570e300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b835167ffffffffffffffff166000908152600860209081526040808320848452909152902054156108925783516040517f32cf0cbf00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff9091166004820152602481018290526044016107da565b60208085015101516108a59060016153a6565b82547fffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffff16600160a81b67ffffffffffffffff92831602179092559251166000908152600860209081526040808320948352939052919091204290555060010161070a565b507f3a3950e13dd607cc37980db0ef14266c40d2bba9c01b2e44bfe549808883095d8160405161093991906153ce565b60405180910390a16109b560008a8a8a8a8a8080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525050604080516020808e0282810182019093528d82529093508d92508c9182918501908490808284376000920191909152508b925061195d915050565b505050505050505050565b610a006109cf8284018461546b565b60408051600080825260208201909252906109fa565b60608152602001906001900390816109e55790505b50611cd4565b604080516000808252602082019092529050610a2360018585858586600061195d565b50505050565b6000610a37600160046154a0565b6002610a446080856154c9565b67ffffffffffffffff16610a5891906154f0565b610a628585611d84565b901c166003811115610a7657610a76614407565b90505b92915050565b6001546001600160a01b03163314610ad95760405162461bcd60e51b815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064016107da565b600080543373ffffffffffffffffffffffffffffffffffffffff19808316821784556001805490911690556040516001600160a01b0390921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b610b45611dcb565b815181518114610b81576040517f83e3f56400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60005b81811015610ccd576000848281518110610ba057610ba0615275565b60200260200101519050600081602001515190506000858481518110610bc857610bc8615275565b6020026020010151905080518214610c0c576040517f83e3f56400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60005b82811015610cbe576000828281518110610c2b57610c2b615275565b6020026020010151905080600014610cb55784602001518281518110610c5357610c53615275565b602002602001015160800151811015610cb55784516040517fc8e9605100000000000000000000000000000000000000000000000000000000815267ffffffffffffffff909116600482015260248101839052604481018290526064016107da565b50600101610c0f565b50505050806001019050610b84565b50610cd88383611cd4565b505050565b610ce561149a565b6105dd81611e4c565b610d316040805160e081019091526000606082018181526080830182905260a0830182905260c08301919091528190815260200160608152602001606081525090565b60ff808316600090815260026020818152604092839020835160e081018552815460608201908152600183015480881660808401526101008104881660a0840152620100009004909616151560c082015294855291820180548451818402810184019095528085529293858301939092830182828015610dda57602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311610dbc575b5050505050815260200160038201805480602002602001604051908101604052809291908181526020018280548015610e3c57602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311610e1e575b5050505050815250509050919050565b610e5461149a565b60005b81811015610cd8576000838383818110610e7357610e73615275565b905060400201803603810190610e899190615507565b9050610e9881602001516113d9565b610efd57805167ffffffffffffffff1660009081526008602090815260408083208285018051855290835281842093909355915191519182527f202f1139a3e334b6056064c0e9b19fd07e44a88d8f6e5ded571b24cf8c371f12910160405180910390a15b50600101610e57565b604080516080808201835260008083526020808401829052838501829052606080850181905267ffffffffffffffff878116845260068352928690208651948501875280546001600160a01b0381168652600160a01b810460ff16151593860193909352600160a81b909204909216948301949094526001840180549394929391840191610f9390615540565b80601f0160208091040260200160405190810160405280929190818152602001828054610fbf90615540565b8015610e3c5780601f10610fe157610100808354040283529160200191610e3c565b820191906000526020600020905b815481529060010190602001808311610fef57505050919092525091949350505050565b33301461104c576040517f371a732800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040805160008082526020820190925281611089565b60408051808201909152600080825260208201528152602001906001900390816110625790505b5060a085015151909150156110bd576110ba8460a00151856020015186606001518760000151602001518787611fb2565b90505b6040805160a0810182528551518152855160209081015167ffffffffffffffff16818301528087015183516000948401926110f9929101614222565b60408051601f19818403018152918152908252878101516020830152018390526005549091506001600160a01b03168015611206576040517f08d450a10000000000000000000000000000000000000000000000000000000081526001600160a01b038216906308d450a19061117390859060040161561c565b600060405180830381600087803b15801561118d57600080fd5b505af192505050801561119e575060015b611206573d8080156111cc576040519150601f19603f3d011682016040523d82523d6000602084013e6111d1565b606091505b50806040517f09c253250000000000000000000000000000000000000000000000000000000081526004016107da9190614222565b60408601515115801561121b57506080860151155b80611232575060608601516001600160a01b03163b155b8061127257506060860151611270906001600160a01b03167f85572ffb000000000000000000000000000000000000000000000000000000006120d1565b155b1561127f57505050505050565b855160209081015167ffffffffffffffff1660009081526006909152604080822054608089015160608a015192517f3cf9798300000000000000000000000000000000000000000000000000000000815284936001600160a01b0390931692633cf97983926112f7928992611388929160040161562f565b6000604051808303816000875af1158015611316573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261133e919081019061566b565b50915091508161137c57806040517f0a8d6e8c0000000000000000000000000000000000000000000000000000000081526004016107da9190614222565b5050505050505050565b61138e61149a565b6105dd816120ed565b61139f61149a565b60005b81518110156113d5576113cd8282815181106113c0576113c0615275565b60200260200101516121a3565b6001016113a2565b5050565b6040805180820182523081526020810183815291517f4d61677100000000000000000000000000000000000000000000000000000000815290516001600160a01b039081166004830152915160248201526000917f00000000000000000000000000000000000000000000000000000000000000001690634d61677190604401602060405180830381865afa158015611476573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a799190615701565b6000546001600160a01b031633146114f45760405162461bcd60e51b815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016107da565b565b60005b81518110156113d557600082828151811061151657611516615275565b602002602001015190506000816020015190508067ffffffffffffffff1660000361156d576040517fc656089500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b81516001600160a01b0316611595576040516342bcdf7f60e11b815260040160405180910390fd5b67ffffffffffffffff811660009081526006602052604081206001810180549192916115c090615540565b80601f01602080910402602001604051908101604052809291908181526020018280546115ec90615540565b80156116395780601f1061160e57610100808354040283529160200191611639565b820191906000526020600020905b81548152906001019060200180831161161c57829003601f168201915b5050505050905060008460600151905081516000036116f1578051600003611674576040516342bcdf7f60e11b815260040160405180910390fd5b600183016116828282615766565b5082547fffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffff16600160a81b17835560405167ffffffffffffffff851681527ff4c1390c70e5c0f491ae1ccbc06f9117cbbadf2767b247b3bc203280f24c0fb99060200160405180910390a1611744565b8080519060200120828051906020012014611744576040517fc39a620500000000000000000000000000000000000000000000000000000000815267ffffffffffffffff851660048201526024016107da565b604080860151845487516001600160a01b031673ffffffffffffffffffffffffffffffffffffffff19921515600160a01b02929092167fffffffffffffffffffffff000000000000000000000000000000000000000000909116171784555167ffffffffffffffff8516907f49f51971edd25182e97182d6ea372a0488ce2ab639f6a3a7ab4df0d2636fe56b906117dc908690615826565b60405180910390a250505050508060010190506114f9565b6040517f2cbc26bb000000000000000000000000000000000000000000000000000000008152608082901b77ffffffffffffffff000000000000000000000000000000001660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690632cbc26bb90602401602060405180830381865afa15801561188f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118b39190615701565b156105dd576040517ffdbd6a7200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff821660048201526024016107da565b67ffffffffffffffff811660009081526006602052604081208054600160a01b900460ff16610a79576040517fed053c5900000000000000000000000000000000000000000000000000000000815267ffffffffffffffff841660048201526024016107da565b60ff878116600090815260026020908152604080832081516080810183528154815260019091015480861693820193909352610100830485169181019190915262010000909104909216151560608301528735906119bc8760a46158f4565b9050826060015115611a045784516119d59060206154f0565b86516119e29060206154f0565b6119ed9060a06158f4565b6119f791906158f4565b611a0190826158f4565b90505b368114611a46576040517f8e1192e1000000000000000000000000000000000000000000000000000000008152600481018290523660248201526044016107da565b5081518114611a8e5781516040517f93df584c0000000000000000000000000000000000000000000000000000000081526004810191909152602481018290526044016107da565b611a96611dcb565b60ff808a1660009081526003602090815260408083203384528252808320815180830190925280548086168352939491939092840191610100909104166002811115611ae457611ae4614407565b6002811115611af557611af5614407565b9052509050600281602001516002811115611b1257611b12614407565b148015611b665750600260008b60ff1660ff168152602001908152602001600020600301816000015160ff1681548110611b4e57611b4e615275565b6000918252602090912001546001600160a01b031633145b611b9c576040517fda0f08e800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50816060015115611c7e576020820151611bb7906001615907565b60ff16855114611bf3576040517f71253a2500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8351855114611c2e576040517fa75d88af00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008787604051611c40929190615920565b604051908190038120611c57918b90602001615930565b604051602081830303815290604052805190602001209050611c7c8a828888886124e7565b505b6040805182815260208a81013567ffffffffffffffff169082015260ff8b16917f198d6990ef96613a9026203077e422916918b03ff47f0be6bee7b02d8e139ef0910160405180910390a2505050505050505050565b8151600003611d0e576040517ebf199700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b805160408051600080825260208201909252911591905b8451811015611d7d57611d75858281518110611d4357611d43615275565b602002602001015184611d6f57858381518110611d6257611d62615275565b60200260200101516126f4565b836126f4565b600101611d25565b5050505050565b67ffffffffffffffff8216600090815260076020526040812081611da9608085615944565b67ffffffffffffffff1681526020810191909152604001600020549392505050565b467f0000000000000000000000000000000000000000000000000000000000000000146114f4576040517f0f01ce850000000000000000000000000000000000000000000000000000000081527f000000000000000000000000000000000000000000000000000000000000000060048201524660248201526044016107da565b80516001600160a01b0316611e74576040516342bcdf7f60e11b815260040160405180910390fd5b80516004805460208085018051604080880180516060808b0180516001600160a01b039b8c167fffffffffffffffff000000000000000000000000000000000000000000000000909a168a17600160a01b63ffffffff988916021777ffffffffffffffffffffffffffffffffffffffffffffffff167801000000000000000000000000000000000000000000000000948816949094026001600160e01b031693909317600160e01b93871693909302929092179098556080808b0180516005805473ffffffffffffffffffffffffffffffffffffffff1916918d169190911790558451988952955185169688019690965290518316918601919091525116938301939093529151909216908201527fa55bd56595c45f517e5967a3067f3dca684445a3080e7c04a4e0d5a40cda627d9060a00160405180910390a150565b6060865167ffffffffffffffff811115611fce57611fce613eca565b60405190808252806020026020018201604052801561201357816020015b6040805180820190915260008082526020820152815260200190600190039081611fec5790505b50905060005b87518110156120c5576120a088828151811061203757612037615275565b602002602001015188888888888781811061205457612054615275565b9050602002810190612066919061596b565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250612e9792505050565b8282815181106120b2576120b2615275565b6020908102919091010152600101612019565b505b9695505050505050565b60006120dc8361323c565b8015610a765750610a7683836132a0565b336001600160a01b038216036121455760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016107da565b6001805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b806040015160ff166000036121ce576000604051631b3fab5160e11b81526004016107da91906159d0565b60208082015160ff8082166000908152600290935260408320600181015492939092839216900361223b57606084015160018201805491151562010000027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ffff909216919091179055612290565b6060840151600182015460ff6201000090910416151590151514612290576040517f87f6037c00000000000000000000000000000000000000000000000000000000815260ff841660048201526024016107da565b60a08401518051601f60ff821611156122bf576001604051631b3fab5160e11b81526004016107da91906159d0565b612325858560030180548060200260200160405190810160405280929190818152602001828054801561231b57602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116122fd575b505050505061335b565b85606001511561245457612393858560020180548060200260200160405190810160405280929190818152602001828054801561231b576020028201919060005260206000209081546001600160a01b031681526001909101906020018083116122fd57505050505061335b565b608086015180516123ad9060028701906020840190613e24565b5080516001850180547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff1661010060ff841690810291909117909155601f101561240d576002604051631b3fab5160e11b81526004016107da91906159d0565b604088015161241d9060036159ea565b60ff168160ff1611612445576003604051631b3fab5160e11b81526004016107da91906159d0565b612451878360016133c4565b50505b612460858360026133c4565b81516124759060038601906020850190613e24565b5060408681015160018501805460ff191660ff8316179055875180865560a089015192517fab8b1b57514019638d7b5ce9c638fe71366fe8e2be1c40a7a80f1733d0e9f547936124ce938a939260028b01929190615a06565b60405180910390a16124df85613544565b505050505050565b6124ef613e96565b835160005b8181101561137c57600060018886846020811061251357612513615275565b61252091901a601b615907565b89858151811061253257612532615275565b602002602001015189868151811061254c5761254c615275565b60200260200101516040516000815260200160405260405161258a949392919093845260ff9290921660208401526040830152606082015260800190565b6020604051602081039080840390855afa1580156125ac573d6000803e3d6000fd5b505060408051601f1981015160ff808e166000908152600360209081528582206001600160a01b0385168352815285822085870190965285548084168652939750909550929392840191610100900416600281111561260d5761260d614407565b600281111561261e5761261e614407565b905250905060018160200151600281111561263b5761263b614407565b14612672576040517fca31867a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8051859060ff16601f811061268957612689615275565b6020020151156126c5576040517ff67bc7c400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600185826000015160ff16601f81106126e0576126e0615275565b9115156020909202015250506001016124f4565b81516126ff816117f4565b600061270a826118f6565b602085015151909150600081900361274d576040517ebf199700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b846040015151811461278b576040517f57e0e08300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008167ffffffffffffffff8111156127a6576127a6613eca565b6040519080825280602002602001820160405280156127cf578160200160208202803683370190505b50905060005b82811015612944576000876020015182815181106127f5576127f5615275565b602002602001015190507f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff1681600001516040015167ffffffffffffffff161461288857805160409081015190517f38432a2200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff90911660048201526024016107da565b61291e8186600101805461289b90615540565b80601f01602080910402602001604051908101604052809291908181526020018280546128c790615540565b80156129145780601f106128e957610100808354040283529160200191612914565b820191906000526020600020905b8154815290600101906020018083116128f757829003601f168201915b5050505050613560565b83838151811061293057612930615275565b6020908102919091010152506001016127d5565b50600061295b858389606001518a60800151613682565b9050806000036129a3576040517f7dd17a7e00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff861660048201526024016107da565b8551151560005b848110156109b55760005a905060008a6020015183815181106129cf576129cf615275565b6020026020010151905060006129ed8a836000015160600151610a29565b90506000816003811115612a0357612a03614407565b1480612a2057506003816003811115612a1e57612a1e614407565b145b612a78578151606001516040805167ffffffffffffffff808e16825290921660208301527f3b575419319662b2a6f5e2467d84521517a3382b908eb3d557bb3fdb0c50e23c91015b60405180910390a1505050612e8f565b8415612b4857600454600090600160a01b900463ffffffff16612a9b88426154a0565b1190508080612abb57506003826003811115612ab957612ab9614407565b145b612afd576040517fa9cfc86200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8c1660048201526024016107da565b8b8581518110612b0f57612b0f615275565b6020026020010151600014612b42578b8581518110612b3057612b30615275565b60200260200101518360800181815250505b50612ba9565b6000816003811115612b5c57612b5c614407565b14612ba9578151606001516040805167ffffffffffffffff808e16825290921660208301527f3ef2a99c550a751d4b0b261268f05a803dfb049ab43616a1ffb388f61fe651209101612a68565b81516080015167ffffffffffffffff1615612c98576000816003811115612bd257612bd2614407565b03612c985781516080015160208301516040517fe0e03cae0000000000000000000000000000000000000000000000000000000081526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169263e0e03cae92612c49928f929190600401615ab2565b6020604051808303816000875af1158015612c68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612c8c9190615701565b612c9857505050612e8f565b60008c604001518581518110612cb057612cb0615275565b6020026020010151905080518360a001515114612d14578251606001516040517f1cfe6d8b00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff808e16600483015290911660248201526044016107da565b612d288b84600001516060015160016136d8565b600080612d358584613780565b91509150612d4c8d866000015160600151846136d8565b8715612dbc576003826003811115612d6657612d66614407565b03612dbc576000846003811115612d7f57612d7f614407565b14612dbc578451516040517f2b11b8d90000000000000000000000000000000000000000000000000000000081526107da91908390600401615adf565b6002826003811115612dd057612dd0614407565b14612e2a576003826003811115612de957612de9614407565b14612e2a578451606001516040517f926c5a3e0000000000000000000000000000000000000000000000000000000081526107da918f918590600401615af8565b8451805160609091015167ffffffffffffffff908116908f167fdc8ccbc35e0eebd81239bcd1971fcd53c7eb34034880142a0f43c809a458732f85855a612e71908d6154a0565b604051612e8093929190615b1e565b60405180910390a45050505050505b6001016129aa565b60408051808201909152600080825260208201526000612eba876020015161384a565b6040517fbbe4f6db0000000000000000000000000000000000000000000000000000000081526001600160a01b0380831660048301529192506000917f0000000000000000000000000000000000000000000000000000000000000000169063bbe4f6db90602401602060405180830381865afa158015612f3f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f639190615b4e565b90506001600160a01b0381161580612fab5750612fa96001600160a01b0382167faff2afbf000000000000000000000000000000000000000000000000000000006120d1565b155b15612fed576040517fae9b4ce90000000000000000000000000000000000000000000000000000000081526001600160a01b03821660048201526024016107da565b600454600090819061300f9089908690600160e01b900463ffffffff166138f0565b9150915060008060006130dc6040518061010001604052808e81526020018c67ffffffffffffffff1681526020018d6001600160a01b031681526020018f606001518152602001896001600160a01b031681526020018f6000015181526020018f6040015181526020018b81525060405160240161308d9190615b6b565b60408051601f198184030181529190526020810180516001600160e01b03167f390775370000000000000000000000000000000000000000000000000000000017905287866113886084613a1e565b9250925092508261311b57816040517fe1cd55090000000000000000000000000000000000000000000000000000000081526004016107da9190614222565b81516020146131635781516040517f78ef80240000000000000000000000000000000000000000000000000000000081526020600482015260248101919091526044016107da565b6000828060200190518101906131799190615c38565b9050866001600160a01b03168c6001600160a01b03161461320e5760006131aa8d8a6131a5868a6154a0565b6138f0565b509050868110806131c45750816131c188836154a0565b14155b1561320c576040517fa966e21f0000000000000000000000000000000000000000000000000000000081526004810183905260248101889052604481018290526064016107da565b505b604080518082019091526001600160a01b039098168852602088015250949550505050505095945050505050565b6000613268827f01ffc9a7000000000000000000000000000000000000000000000000000000006132a0565b8015610a795750613299827fffffffff000000000000000000000000000000000000000000000000000000006132a0565b1592915050565b6040517fffffffff0000000000000000000000000000000000000000000000000000000082166024820152600090819060440160408051601f19818403018152919052602080820180516001600160e01b03167f01ffc9a700000000000000000000000000000000000000000000000000000000178152825192935060009283928392909183918a617530fa92503d91506000519050828015613344575060208210155b80156133505750600081115b979650505050505050565b60005b8151811015610cd85760ff83166000908152600360205260408120835190919084908490811061339057613390615275565b6020908102919091018101516001600160a01b03168252810191909152604001600020805461ffff1916905560010161335e565b60005b82518160ff161015610a23576000838260ff16815181106133ea576133ea615275565b602002602001015190506000600281111561340757613407614407565b60ff80871660009081526003602090815260408083206001600160a01b0387168452909152902054610100900416600281111561344657613446614407565b14613467576004604051631b3fab5160e11b81526004016107da91906159d0565b6001600160a01b0381166134a7576040517fd6c62c9b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60405180604001604052808360ff1681526020018460028111156134cd576134cd614407565b905260ff80871660009081526003602090815260408083206001600160a01b0387168452825290912083518154931660ff198416811782559184015190929091839161ffff19161761010083600281111561352a5761352a614407565b0217905550905050508061353d90615c51565b90506133c7565b60ff81166105dd576009805467ffffffffffffffff1916905550565b8151602080820151604092830151925160009384936135a6937f2425b0b9f9054c76ff151b0a175b18f37a4a4e82013a72e9f15c9caa095ed21f93909291889101615c70565b60408051601f1981840301815290829052805160209182012086518051888401516060808b0151908401516080808d015195015195976135ef9794969395929491939101615ca3565b604051602081830303815290604052805190602001208560400151805190602001208660a001516040516020016136269190615d9a565b60408051601f198184030181528282528051602091820120908301969096528101939093526060830191909152608082015260a081019190915260c0015b60405160208183030381529060405280519060200120905092915050565b600080613690858585613b44565b905061369b816113d9565b6136a95760009150506136d0565b67ffffffffffffffff86166000908152600860209081526040808320938352929052205490505b949350505050565b600060026136e76080856154c9565b67ffffffffffffffff166136fb91906154f0565b905060006137098585611d84565b905081613718600160046154a0565b901b19168183600381111561372f5761372f614407565b67ffffffffffffffff871660009081526007602052604081209190921b9290921791829161375e608088615944565b67ffffffffffffffff1681526020810191909152604001600020555050505050565b6040517fece670b6000000000000000000000000000000000000000000000000000000008152600090606090309063ece670b6906137c49087908790600401615dfa565b600060405180830381600087803b1580156137de57600080fd5b505af19250505080156137ef575060015b61382e573d80801561381d576040519150601f19603f3d011682016040523d82523d6000602084013e613822565b606091505b50600392509050613843565b50506040805160208101909152600081526002905b9250929050565b6000815160201461388957816040517f8d666f600000000000000000000000000000000000000000000000000000000081526004016107da9190614222565b60008280602001905181019061389f9190615c38565b90506001600160a01b038111806138b7575061040081105b15610a7957826040517f8d666f600000000000000000000000000000000000000000000000000000000081526004016107da9190614222565b600080600080600061396a8860405160240161391b91906001600160a01b0391909116815260200190565b60408051601f198184030181529190526020810180516001600160e01b03167f70a082310000000000000000000000000000000000000000000000000000000017905288886113886084613a1e565b925092509250826139a957816040517fe1cd55090000000000000000000000000000000000000000000000000000000081526004016107da9190614222565b60208251146139f15781516040517f78ef80240000000000000000000000000000000000000000000000000000000081526020600482015260248101919091526044016107da565b81806020019051810190613a059190615c38565b613a0f82886154a0565b94509450505050935093915050565b6000606060008361ffff1667ffffffffffffffff811115613a4157613a41613eca565b6040519080825280601f01601f191660200182016040528015613a6b576020820181803683370190505b509150863b613a9e577f0c3b563c0000000000000000000000000000000000000000000000000000000060005260046000fd5b5a85811015613ad1577fafa32a2c0000000000000000000000000000000000000000000000000000000060005260046000fd5b8590036040810481038710613b0a577f37c3be290000000000000000000000000000000000000000000000000000000060005260046000fd5b505a6000808a5160208c0160008c8cf193505a900390503d84811115613b2d5750835b808352806000602085013e50955095509592505050565b8251825160009190818303613b85576040517f11a6b26400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6101018211801590613b9957506101018111155b613bb6576040516309bde33960e01b815260040160405180910390fd5b60001982820101610100811115613be0576040516309bde33960e01b815260040160405180910390fd5b80600003613c0d5786600081518110613bfb57613bfb615275565b60200260200101519350505050613ddc565b60008167ffffffffffffffff811115613c2857613c28613eca565b604051908082528060200260200182016040528015613c51578160200160208202803683370190505b50905060008080805b85811015613d7b5760006001821b8b811603613cb55788851015613c9e578c5160018601958e918110613c8f57613c8f615275565b60200260200101519050613cd7565b8551600185019487918110613c8f57613c8f615275565b8b5160018401938d918110613ccc57613ccc615275565b602002602001015190505b600089861015613d07578d5160018701968f918110613cf857613cf8615275565b60200260200101519050613d29565b8651600186019588918110613d1e57613d1e615275565b602002602001015190505b82851115613d4a576040516309bde33960e01b815260040160405180910390fd5b613d548282613de3565b878481518110613d6657613d66615275565b60209081029190910101525050600101613c5a565b506001850382148015613d8d57508683145b8015613d9857508581145b613db5576040516309bde33960e01b815260040160405180910390fd5b836001860381518110613dca57613dca615275565b60200260200101519750505050505050505b9392505050565b6000818310613dfb57613df68284613e01565b610a76565b610a7683835b604080516001602082015290810183905260608101829052600090608001613664565b828054828255906000526020600020908101928215613e86579160200282015b82811115613e86578251825473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b03909116178255602090920191600190910190613e44565b50613e92929150613eb5565b5090565b604051806103e00160405280601f906020820280368337509192915050565b5b80821115613e925760008155600101613eb6565b634e487b7160e01b600052604160045260246000fd5b6040516080810167ffffffffffffffff81118282101715613f0357613f03613eca565b60405290565b60405160a0810167ffffffffffffffff81118282101715613f0357613f03613eca565b60405160c0810167ffffffffffffffff81118282101715613f0357613f03613eca565b6040805190810167ffffffffffffffff81118282101715613f0357613f03613eca565b6040516060810167ffffffffffffffff81118282101715613f0357613f03613eca565b604051601f8201601f1916810167ffffffffffffffff81118282101715613fbe57613fbe613eca565b604052919050565b600067ffffffffffffffff821115613fe057613fe0613eca565b5060051b60200190565b6001600160a01b03811681146105dd57600080fd5b803567ffffffffffffffff8116811461401757600080fd5b919050565b80151581146105dd57600080fd5b80356140178161401c565b600067ffffffffffffffff82111561404f5761404f613eca565b50601f01601f191660200190565b600082601f83011261406e57600080fd5b813561408161407c82614035565b613f95565b81815284602083860101111561409657600080fd5b816020850160208301376000918101602001919091529392505050565b600060208083850312156140c657600080fd5b823567ffffffffffffffff808211156140de57600080fd5b818501915085601f8301126140f257600080fd5b813561410061407c82613fc6565b81815260059190911b8301840190848101908883111561411f57600080fd5b8585015b838110156141c55780358581111561413b5760008081fd5b86016080818c03601f19018113156141535760008081fd5b61415b613ee0565b8983013561416881613fea565b81526040614177848201613fff565b8b83015260608085013561418a8161401c565b838301529284013592898411156141a357600091508182fd5b6141b18f8d8688010161405d565b908301525085525050918601918601614123565b5098975050505050505050565b60005b838110156141ed5781810151838201526020016141d5565b50506000910152565b6000815180845261420e8160208601602086016141d2565b601f01601f19169290920160200192915050565b602081526000610a7660208301846141f6565b8060608101831015610a7957600080fd5b60008083601f84011261425857600080fd5b50813567ffffffffffffffff81111561427057600080fd5b60208301915083602082850101111561384357600080fd5b60008083601f84011261429a57600080fd5b50813567ffffffffffffffff8111156142b257600080fd5b6020830191508360208260051b850101111561384357600080fd5b60008060008060008060008060e0898b0312156142e957600080fd5b6142f38a8a614235565b9750606089013567ffffffffffffffff8082111561431057600080fd5b61431c8c838d01614246565b909950975060808b013591508082111561433557600080fd5b6143418c838d01614288565b909750955060a08b013591508082111561435a57600080fd5b506143678b828c01614288565b999c989b50969995989497949560c00135949350505050565b60008060006080848603121561439557600080fd5b61439f8585614235565b9250606084013567ffffffffffffffff8111156143bb57600080fd5b6143c786828701614246565b9497909650939450505050565b600080604083850312156143e757600080fd5b6143f083613fff565b91506143fe60208401613fff565b90509250929050565b634e487b7160e01b600052602160045260246000fd5b6004811061442d5761442d614407565b9052565b60208101610a79828461441d565b600060a0828403121561445157600080fd5b614459613f09565b90508135815261446b60208301613fff565b602082015261447c60408301613fff565b604082015261448d60608301613fff565b606082015261449e60808301613fff565b608082015292915050565b803561401781613fea565b600082601f8301126144c557600080fd5b813560206144d561407c83613fc6565b82815260059290921b840181019181810190868411156144f457600080fd5b8286015b848110156120c557803567ffffffffffffffff808211156145195760008081fd5b8189019150608080601f19848d030112156145345760008081fd5b61453c613ee0565b878401358381111561454e5760008081fd5b61455c8d8a8388010161405d565b825250604080850135848111156145735760008081fd5b6145818e8b8389010161405d565b8a840152506060808601358581111561459a5760008081fd5b6145a88f8c838a010161405d565b92840192909252949092013593810193909352505083529183019183016144f8565b600061014082840312156145dd57600080fd5b6145e5613f2c565b90506145f1838361443f565b815260a082013567ffffffffffffffff8082111561460e57600080fd5b61461a8583860161405d565b602084015260c084013591508082111561463357600080fd5b61463f8583860161405d565b604084015261465060e085016144a9565b6060840152610100840135608084015261012084013591508082111561467557600080fd5b50614682848285016144b4565b60a08301525092915050565b600082601f83011261469f57600080fd5b813560206146af61407c83613fc6565b82815260059290921b840181019181810190868411156146ce57600080fd5b8286015b848110156120c557803567ffffffffffffffff8111156146f25760008081fd5b6147008986838b01016145ca565b8452509183019183016146d2565b600082601f83011261471f57600080fd5b8135602061472f61407c83613fc6565b82815260059290921b8401810191818101908684111561474e57600080fd5b8286015b848110156120c557803567ffffffffffffffff8082111561477257600080fd5b818901915089603f83011261478657600080fd5b8582013561479661407c82613fc6565b81815260059190911b830160400190878101908c8311156147b657600080fd5b604085015b838110156147ef578035858111156147d257600080fd5b6147e18f6040838a010161405d565b8452509189019189016147bb565b50875250505092840192508301614752565b600082601f83011261481257600080fd5b8135602061482261407c83613fc6565b8083825260208201915060208460051b87010193508684111561484457600080fd5b602086015b848110156120c55780358352918301918301614849565b600082601f83011261487157600080fd5b8135602061488161407c83613fc6565b82815260059290921b840181019181810190868411156148a057600080fd5b8286015b848110156120c557803567ffffffffffffffff808211156148c55760008081fd5b818901915060a080601f19848d030112156148e05760008081fd5b6148e8613f09565b6148f3888501613fff565b8152604080850135848111156149095760008081fd5b6149178e8b8389010161468e565b8a84015250606080860135858111156149305760008081fd5b61493e8f8c838a010161470e565b83850152506080915081860135858111156149595760008081fd5b6149678f8c838a0101614801565b91840191909152509190930135908301525083529183019183016148a4565b600080604080848603121561499a57600080fd5b833567ffffffffffffffff808211156149b257600080fd5b6149be87838801614860565b94506020915081860135818111156149d557600080fd5b8601601f810188136149e657600080fd5b80356149f461407c82613fc6565b81815260059190911b8201840190848101908a831115614a1357600080fd5b8584015b83811015614a9f57803586811115614a2f5760008081fd5b8501603f81018d13614a415760008081fd5b87810135614a5161407c82613fc6565b81815260059190911b82018a0190898101908f831115614a715760008081fd5b928b01925b82841015614a8f5783358252928a0192908a0190614a76565b8652505050918601918601614a17565b50809750505050505050509250929050565b600060208284031215614ac357600080fd5b813567ffffffffffffffff811115614ada57600080fd5b820160a08185031215613ddc57600080fd5b803563ffffffff8116811461401757600080fd5b600060a08284031215614b1257600080fd5b614b1a613f09565b8235614b2581613fea565b8152614b3360208401614aec565b6020820152614b4460408401614aec565b6040820152614b5560608401614aec565b60608201526080830135614b6881613fea565b60808201529392505050565b803560ff8116811461401757600080fd5b600060208284031215614b9757600080fd5b610a7682614b74565b60008151808452602080850194506020840160005b83811015614bda5781516001600160a01b031687529582019590820190600101614bb5565b509495945050505050565b60208152600082518051602084015260ff602082015116604084015260ff604082015116606084015260608101511515608084015250602083015160c060a0840152614c3460e0840182614ba0565b90506040840151601f198483030160c0850152614c518282614ba0565b95945050505050565b60008060408385031215614c6d57600080fd5b614c7683613fff565b946020939093013593505050565b60008060208385031215614c9757600080fd5b823567ffffffffffffffff80821115614caf57600080fd5b818501915085601f830112614cc357600080fd5b813581811115614cd257600080fd5b8660208260061b8501011115614ce757600080fd5b60209290920196919550909350505050565b600060208284031215614d0b57600080fd5b610a7682613fff565b602081526001600160a01b03825116602082015260208201511515604082015267ffffffffffffffff6040830151166060820152600060608301516080808401526136d060a08401826141f6565b600080600060408486031215614d7757600080fd5b833567ffffffffffffffff80821115614d8f57600080fd5b614d9b878388016145ca565b94506020860135915080821115614db157600080fd5b506143c786828701614288565b600060208284031215614dd057600080fd5b8135613ddc81613fea565b600082601f830112614dec57600080fd5b81356020614dfc61407c83613fc6565b8083825260208201915060208460051b870101935086841115614e1e57600080fd5b602086015b848110156120c5578035614e3681613fea565b8352918301918301614e23565b60006020808385031215614e5657600080fd5b823567ffffffffffffffff80821115614e6e57600080fd5b818501915085601f830112614e8257600080fd5b8135614e9061407c82613fc6565b81815260059190911b83018401908481019088831115614eaf57600080fd5b8585015b838110156141c557803585811115614eca57600080fd5b860160c0818c03601f19011215614ee15760008081fd5b614ee9613f2c565b8882013581526040614efc818401614b74565b8a8301526060614f0d818501614b74565b8284015260809150614f2082850161402a565b9083015260a08381013589811115614f385760008081fd5b614f468f8d83880101614ddb565b838501525060c0840135915088821115614f605760008081fd5b614f6e8e8c84870101614ddb565b9083015250845250918601918601614eb3565b600060208284031215614f9357600080fd5b5035919050565b80356001600160e01b038116811461401757600080fd5b600082601f830112614fc257600080fd5b81356020614fd261407c83613fc6565b82815260069290921b84018101918181019086841115614ff157600080fd5b8286015b848110156120c5576040818903121561500e5760008081fd5b615016613f4f565b61501f82613fff565b815261502c858301614f9a565b81860152835291830191604001614ff5565b600082601f83011261504f57600080fd5b8135602061505f61407c83613fc6565b82815260079290921b8401810191818101908684111561507e57600080fd5b8286015b848110156120c557808803608081121561509c5760008081fd5b6150a4613f72565b6150ad83613fff565b8152604080601f19840112156150c35760008081fd5b6150cb613f4f565b92506150d8878501613fff565b83526150e5818501613fff565b8388015281870192909252606083013591810191909152835291830191608001615082565b6000602080838503121561511d57600080fd5b823567ffffffffffffffff8082111561513557600080fd5b8185019150604080838803121561514b57600080fd5b615153613f4f565b83358381111561516257600080fd5b84016040818a03121561517457600080fd5b61517c613f4f565b81358581111561518b57600080fd5b8201601f81018b1361519c57600080fd5b80356151aa61407c82613fc6565b81815260069190911b8201890190898101908d8311156151c957600080fd5b928a01925b828410156152195787848f0312156151e65760008081fd5b6151ee613f4f565b84356151f981613fea565b8152615206858d01614f9a565b818d0152825292870192908a01906151ce565b84525050508187013593508484111561523157600080fd5b61523d8a858401614fb1565b818801528252508385013591508282111561525757600080fd5b6152638883860161503e565b85820152809550505050505092915050565b634e487b7160e01b600052603260045260246000fd5b805160408084528151848201819052600092602091908201906060870190855b818110156152e257835180516001600160a01b031684528501516001600160e01b03168584015292840192918501916001016152ab565b50508583015187820388850152805180835290840192506000918401905b8083101561533c578351805167ffffffffffffffff1683528501516001600160e01b031685830152928401926001929092019190850190615300565b50979650505050505050565b602081526000610a76602083018461528b565b67ffffffffffffffff8316815260608101613ddc6020830184805167ffffffffffffffff908116835260209182015116910152565b634e487b7160e01b600052601160045260246000fd5b67ffffffffffffffff8181168382160190808211156153c7576153c7615390565b5092915050565b6000602080835260608451604080848701526153ed606087018361528b565b87850151878203601f19016040890152805180835290860193506000918601905b808310156141c557845167ffffffffffffffff81511683528781015161544d89850182805167ffffffffffffffff908116835260209182015116910152565b5084015182870152938601936001929092019160809091019061540e565b60006020828403121561547d57600080fd5b813567ffffffffffffffff81111561549457600080fd5b6136d084828501614860565b81810381811115610a7957610a79615390565b634e487b7160e01b600052601260045260246000fd5b600067ffffffffffffffff808416806154e4576154e46154b3565b92169190910692915050565b8082028115828204841417610a7957610a79615390565b60006040828403121561551957600080fd5b615521613f4f565b61552a83613fff565b8152602083013560208201528091505092915050565b600181811c9082168061555457607f821691505b60208210810361557457634e487b7160e01b600052602260045260246000fd5b50919050565b805182526000602067ffffffffffffffff81840151168185015260408084015160a060408701526155ae60a08701826141f6565b9050606085015186820360608801526155c782826141f6565b608087810151898303918a01919091528051808352908601935060009250908501905b8083101561533c57835180516001600160a01b03168352860151868301529285019260019290920191908401906155ea565b602081526000610a76602083018461557a565b608081526000615642608083018761557a565b61ffff9590951660208301525060408101929092526001600160a01b0316606090910152919050565b60008060006060848603121561568057600080fd5b835161568b8161401c565b602085015190935067ffffffffffffffff8111156156a857600080fd5b8401601f810186136156b957600080fd5b80516156c761407c82614035565b8181528760208385010111156156dc57600080fd5b6156ed8260208301602086016141d2565b809450505050604084015190509250925092565b60006020828403121561571357600080fd5b8151613ddc8161401c565b601f821115610cd8576000816000526020600020601f850160051c810160208610156157475750805b601f850160051c820191505b818110156124df57828155600101615753565b815167ffffffffffffffff81111561578057615780613eca565b6157948161578e8454615540565b8461571e565b602080601f8311600181146157c957600084156157b15750858301515b600019600386901b1c1916600185901b1785556124df565b600085815260208120601f198616915b828110156157f8578886015182559484019460019091019084016157d9565b50858210156158165787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000602080835283546001600160a01b038116602085015260ff8160a01c161515604085015267ffffffffffffffff8160a81c1660608501525060018085016080808601526000815461587881615540565b8060a089015260c0600183166000811461589957600181146158b5576158e5565b60ff19841660c08b015260c083151560051b8b010194506158e5565b85600052602060002060005b848110156158dc5781548c82018501529088019089016158c1565b8b0160c0019550505b50929998505050505050505050565b80820180821115610a7957610a79615390565b60ff8181168382160190811115610a7957610a79615390565b8183823760009101908152919050565b828152606082602083013760800192915050565b600067ffffffffffffffff8084168061595f5761595f6154b3565b92169190910492915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126159a057600080fd5b83018035915067ffffffffffffffff8211156159bb57600080fd5b60200191503681900382131561384357600080fd5b60208101600583106159e4576159e4614407565b91905290565b60ff81811683821602908116908181146153c7576153c7615390565b600060a0820160ff881683526020878185015260a0604085015281875480845260c0860191508860005282600020935060005b81811015615a5e5784546001600160a01b031683526001948501949284019201615a39565b50508481036060860152865180825290820192508187019060005b81811015615a9e5782516001600160a01b031685529383019391830191600101615a79565b50505060ff851660808501525090506120c7565b600067ffffffffffffffff808616835280851660208401525060606040830152614c5160608301846141f6565b8281526040602082015260006136d060408301846141f6565b67ffffffffffffffff848116825283166020820152606081016136d0604083018461441d565b615b28818561441d565b606060208201526000615b3e60608301856141f6565b9050826040830152949350505050565b600060208284031215615b6057600080fd5b8151613ddc81613fea565b6020815260008251610100806020850152615b8a6101208501836141f6565b91506020850151615ba7604086018267ffffffffffffffff169052565b5060408501516001600160a01b038116606086015250606085015160808501526080850151615be160a08601826001600160a01b03169052565b5060a0850151601f19808685030160c0870152615bfe84836141f6565b935060c08701519150808685030160e0870152615c1b84836141f6565b935060e08701519150808685030183870152506120c783826141f6565b600060208284031215615c4a57600080fd5b5051919050565b600060ff821660ff8103615c6757615c67615390565b60010192915050565b848152600067ffffffffffffffff8086166020840152808516604084015250608060608301526120c760808301846141f6565b86815260c060208201526000615cbc60c08301886141f6565b6001600160a01b039690961660408301525067ffffffffffffffff9384166060820152608081019290925290911660a09091015292915050565b600082825180855260208086019550808260051b84010181860160005b84811015615d8d57601f19868403018952815160808151818652615d39828701826141f6565b9150508582015185820387870152615d5182826141f6565b91505060408083015186830382880152615d6b83826141f6565b6060948501519790940196909652505098840198925090830190600101615d13565b5090979650505050505050565b602081526000610a766020830184615cf6565b60008282518085526020808601955060208260051b8401016020860160005b84811015615d8d57601f19868403018952615de88383516141f6565b98840198925090830190600101615dcc565b604081526000835180516040840152602081015167ffffffffffffffff80821660608601528060408401511660808601528060608401511660a08601528060808401511660c086015250505060208401516101408060e0850152615e626101808501836141f6565b915060408601517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc08086850301610100870152615e9f84836141f6565b935060608801519150615ebe6101208701836001600160a01b03169052565b60808801518387015260a0880151925080868503016101608701525050615ee58282615cf6565b9150508281036020840152614c518185615dad56fea164736f6c6343000818000a",
+	ABI: "[{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"}],\"internalType\":\"structOffRamp.StaticConfig\",\"name\":\"staticConfig\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"feeQuoter\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"permissionLessExecutionThresholdSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxTokenTransferGas\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPoolReleaseOrMintGas\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"}],\"internalType\":\"structOffRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"internalType\":\"structOffRamp.SourceChainConfigArgs[]\",\"name\":\"sourceChainConfigs\",\"type\":\"tuple[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"CanOnlySelfCall\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"expected\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"actual\",\"type\":\"bytes32\"}],\"name\":\"ConfigDigestMismatch\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"CursedByRMN\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"EmptyReport\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"err\",\"type\":\"bytes\"}],\"name\":\"ExecutionError\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"expected\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"actual\",\"type\":\"uint256\"}],\"name\":\"ForkedChain\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"enumMultiOCR3Base.InvalidConfigErrorType\",\"name\":\"errorType\",\"type\":\"uint8\"}],\"name\":\"InvalidConfig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"expected\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"got\",\"type\":\"uint256\"}],\"name\":\"InvalidDataLength\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"encodedAddress\",\"type\":\"bytes\"}],\"name\":\"InvalidEVMAddress\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"}],\"name\":\"InvalidInterval\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"index\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"newLimit\",\"type\":\"uint256\"}],\"name\":\"InvalidManualExecutionGasLimit\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"messageDestChainSelector\",\"type\":\"uint64\"}],\"name\":\"InvalidMessageDestChainSelector\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"enumInternal.MessageExecutionState\",\"name\":\"newState\",\"type\":\"uint8\"}],\"name\":\"InvalidNewState\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidProof\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidRoot\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"InvalidStaticConfig\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"LeavesCannotBeEmpty\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ManualExecutionGasLimitMismatch\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"ManualExecutionNotYetEnabled\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"errorReason\",\"type\":\"bytes\"}],\"name\":\"MessageValidationError\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"NonUniqueSignatures\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"notPool\",\"type\":\"address\"}],\"name\":\"NotACompatiblePool\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OracleCannotBeZeroAddress\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"err\",\"type\":\"bytes\"}],\"name\":\"ReceiverError\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountReleased\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"balancePre\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"balancePost\",\"type\":\"uint256\"}],\"name\":\"ReleaseOrMintBalanceMismatch\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"name\":\"RootAlreadyCommitted\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"RootNotCommitted\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"SignaturesOutOfRegistration\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"SourceChainNotEnabled\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"StaleCommitReport\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"ocrPluginType\",\"type\":\"uint8\"}],\"name\":\"StaticConfigCannotBeChanged\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"TokenDataMismatch\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"err\",\"type\":\"bytes\"}],\"name\":\"TokenHandlingError\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnauthorizedSigner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnauthorizedTransmitter\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnexpectedTokenData\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"expected\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"actual\",\"type\":\"uint256\"}],\"name\":\"WrongMessageLength\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WrongNumberOfSignatures\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ZeroAddressNotAllowed\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"ZeroChainSelectorNotAllowed\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"AlreadyAttempted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"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\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.MerkleRoot[]\",\"name\":\"merkleRoots\",\"type\":\"tuple[]\"}],\"indexed\":false,\"internalType\":\"structOffRamp.CommitReport\",\"name\":\"report\",\"type\":\"tuple\"}],\"name\":\"CommitReportAccepted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"ocrPluginType\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"transmitters\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"F\",\"type\":\"uint8\"}],\"name\":\"ConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"feeQuoter\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"permissionLessExecutionThresholdSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxTokenTransferGas\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPoolReleaseOrMintGas\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structOffRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"}],\"name\":\"DynamicConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"enumInternal.MessageExecutionState\",\"name\":\"state\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"returnData\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"gasUsed\",\"type\":\"uint256\"}],\"name\":\"ExecutionStateChanged\",\"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\":false,\"internalType\":\"bytes32\",\"name\":\"root\",\"type\":\"bytes32\"}],\"name\":\"RootRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"SkippedAlreadyExecutedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint64\",\"name\":\"minSeqNr\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"indexed\":false,\"internalType\":\"structOffRamp.SourceChainConfig\",\"name\":\"sourceConfig\",\"type\":\"tuple\"}],\"name\":\"SourceChainConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"SourceChainSelectorAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structOffRamp.StaticConfig\",\"name\":\"staticConfig\",\"type\":\"tuple\"}],\"name\":\"StaticConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint8\",\"name\":\"ocrPluginType\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"Transmitted\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"internalType\":\"structOffRamp.SourceChainConfigArgs[]\",\"name\":\"sourceChainConfigUpdates\",\"type\":\"tuple[]\"}],\"name\":\"applySourceChainConfigUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"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\":\"destTokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structClient.Any2EVMMessage\",\"name\":\"\",\"type\":\"tuple\"}],\"name\":\"ccipReceive\",\"outputs\":[],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32[3]\",\"name\":\"reportContext\",\"type\":\"bytes32[3]\"},{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"},{\"internalType\":\"bytes32[]\",\"name\":\"rs\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes32[]\",\"name\":\"ss\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes32\",\"name\":\"rawVs\",\"type\":\"bytes32\"}],\"name\":\"commit\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32[3]\",\"name\":\"reportContext\",\"type\":\"bytes32[3]\"},{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"}],\"name\":\"execute\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"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.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.Any2EVMRampMessage\",\"name\":\"message\",\"type\":\"tuple\"},{\"internalType\":\"bytes[]\",\"name\":\"offchainTokenData\",\"type\":\"bytes[]\"}],\"name\":\"executeSingleMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getDynamicConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"feeQuoter\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"permissionLessExecutionThresholdSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxTokenTransferGas\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPoolReleaseOrMintGas\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"}],\"internalType\":\"structOffRamp.DynamicConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"}],\"name\":\"getExecutionState\",\"outputs\":[{\"internalType\":\"enumInternal.MessageExecutionState\",\"name\":\"\",\"type\":\"uint8\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getLatestPriceSequenceNumber\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"root\",\"type\":\"bytes32\"}],\"name\":\"getMerkleRoot\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"getSourceChainConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"isEnabled\",\"type\":\"bool\"},{\"internalType\":\"uint64\",\"name\":\"minSeqNr\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"onRamp\",\"type\":\"bytes\"}],\"internalType\":\"structOffRamp.SourceChainConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getStaticConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"}],\"internalType\":\"structOffRamp.StaticConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"root\",\"type\":\"bytes32\"}],\"name\":\"isBlessed\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"ocrPluginType\",\"type\":\"uint8\"}],\"name\":\"latestConfigDetails\",\"outputs\":[{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"internalType\":\"uint8\",\"name\":\"F\",\"type\":\"uint8\"},{\"internalType\":\"uint8\",\"name\":\"n\",\"type\":\"uint8\"},{\"internalType\":\"bool\",\"name\":\"isSignatureVerificationEnabled\",\"type\":\"bool\"}],\"internalType\":\"structMultiOCR3Base.ConfigInfo\",\"name\":\"configInfo\",\"type\":\"tuple\"},{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"transmitters\",\"type\":\"address[]\"}],\"internalType\":\"structMultiOCR3Base.OCRConfig\",\"name\":\"ocrConfig\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"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.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.Any2EVMRampMessage[]\",\"name\":\"messages\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes[][]\",\"name\":\"offchainTokenData\",\"type\":\"bytes[][]\"},{\"internalType\":\"bytes32[]\",\"name\":\"proofs\",\"type\":\"bytes32[]\"},{\"internalType\":\"uint256\",\"name\":\"proofFlagBits\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.ExecutionReportSingleChain[]\",\"name\":\"reports\",\"type\":\"tuple[]\"},{\"internalType\":\"uint256[][]\",\"name\":\"gasLimitOverrides\",\"type\":\"uint256[][]\"}],\"name\":\"manuallyExecute\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.UnblessedRoot[]\",\"name\":\"rootToReset\",\"type\":\"tuple[]\"}],\"name\":\"resetUnblessedRoots\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"feeQuoter\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"permissionLessExecutionThresholdSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxTokenTransferGas\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"maxPoolReleaseOrMintGas\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"}],\"internalType\":\"structOffRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"}],\"name\":\"setDynamicConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"internalType\":\"uint8\",\"name\":\"ocrPluginType\",\"type\":\"uint8\"},{\"internalType\":\"uint8\",\"name\":\"F\",\"type\":\"uint8\"},{\"internalType\":\"bool\",\"name\":\"isSignatureVerificationEnabled\",\"type\":\"bool\"},{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"transmitters\",\"type\":\"address[]\"}],\"internalType\":\"structMultiOCR3Base.OCRConfigArgs[]\",\"name\":\"ocrConfigArgs\",\"type\":\"tuple[]\"}],\"name\":\"setOCR3Configs\",\"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\"}]",
+	Bin: "0x6101206040523480156200001257600080fd5b5060405162006c4a38038062006c4a8339810160408190526200003591620008c7565b33806000816200008c5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000bf57620000bf81620001fa565b5050466080525060208301516001600160a01b03161580620000ec575060408301516001600160a01b0316155b8062000103575060608301516001600160a01b0316155b1562000122576040516342bcdf7f60e11b815260040160405180910390fd5b82516001600160401b03166000036200014e5760405163c656089560e01b815260040160405180910390fd5b82516001600160401b0390811660a052602080850180516001600160a01b0390811660c05260408088018051831660e0526060808a01805185166101005283518b519098168852945184169587019590955251821690850152905116908201527f683eb52ee924eb817377cfa8f41f238f4bb7a877da5267869dfffbad85f564d89060800160405180910390a1620001e682620002a5565b620001f181620003c1565b50505062000c67565b336001600160a01b03821603620002545760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000083565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b80516001600160a01b0316620002ce576040516342bcdf7f60e11b815260040160405180910390fd5b80516004805460208085018051604080880180516060808b0180516001600160a01b039b8c166001600160c01b0319909a168a17600160a01b63ffffffff98891602176001600160c01b0316600160c01b948816949094026001600160e01b031693909317600160e01b93871693909302929092179098556080808b018051600580546001600160a01b031916918d169190911790558451988952955185169688019690965290518316918601919091525116938301939093529151909216908201527fa55bd56595c45f517e5967a3067f3dca684445a3080e7c04a4e0d5a40cda627d9060a00160405180910390a150565b60005b815181101562000666576000828281518110620003e557620003e562000a1d565b60200260200101519050600081602001519050806001600160401b0316600003620004235760405163c656089560e01b815260040160405180910390fd5b81516001600160a01b03166200044c576040516342bcdf7f60e11b815260040160405180910390fd5b6001600160401b0381166000908152600660205260408120600181018054919291620004789062000a33565b80601f0160208091040260200160405190810160405280929190818152602001828054620004a69062000a33565b8015620004f75780601f10620004cb57610100808354040283529160200191620004f7565b820191906000526020600020905b815481529060010190602001808311620004d957829003601f168201915b5050505050905060008460600151905081516000036200059e57805160000362000534576040516342bcdf7f60e11b815260040160405180910390fd5b6001830162000544828262000ac4565b508254600160a81b600160e81b031916600160a81b1783556040516001600160401b03851681527ff4c1390c70e5c0f491ae1ccbc06f9117cbbadf2767b247b3bc203280f24c0fb99060200160405180910390a1620005d9565b8080519060200120828051906020012014620005d95760405163c39a620560e01b81526001600160401b038516600482015260240162000083565b604080860151845487516001600160a01b03166001600160a01b0319921515600160a01b02929092166001600160a81b031990911617178455516001600160401b038516907f49f51971edd25182e97182d6ea372a0488ce2ab639f6a3a7ab4df0d2636fe56b906200064d90869062000b90565b60405180910390a25050505050806001019050620003c4565b5050565b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b0381118282101715620006a557620006a56200066a565b60405290565b604051601f8201601f191681016001600160401b0381118282101715620006d657620006d66200066a565b604052919050565b80516001600160401b0381168114620006f657600080fd5b919050565b6001600160a01b03811681146200071157600080fd5b50565b805163ffffffff81168114620006f657600080fd5b6000601f83601f8401126200073d57600080fd5b825160206001600160401b03808311156200075c576200075c6200066a565b8260051b6200076d838201620006ab565b93845286810183019383810190898611156200078857600080fd5b84890192505b85831015620008ba57825184811115620007a85760008081fd5b89016080601f19828d038101821315620007c25760008081fd5b620007cc62000680565b88840151620007db81620006fb565b81526040620007ec858201620006de565b8a8301526060808601518015158114620008065760008081fd5b838301529385015193898511156200081e5760008081fd5b84860195508f603f8701126200083657600094508485fd5b8a8601519450898511156200084f576200084f6200066a565b620008608b858f88011601620006ab565b93508484528f82868801011115620008785760008081fd5b60005b8581101562000898578681018301518582018d01528b016200087b565b5060009484018b0194909452509182015283525091840191908401906200078e565b9998505050505050505050565b6000806000838503610140811215620008df57600080fd5b6080811215620008ee57600080fd5b620008f862000680565b6200090386620006de565b815260208601516200091581620006fb565b602082015260408601516200092a81620006fb565b604082015260608601516200093f81620006fb565b6060820152935060a0607f19820112156200095957600080fd5b5060405160a081016001600160401b0380821183831017156200098057620009806200066a565b81604052608087015191506200099682620006fb565b818352620009a760a0880162000714565b6020840152620009ba60c0880162000714565b6040840152620009cd60e0880162000714565b60608401526101008701519150620009e582620006fb565b608083018290526101208701519294508083111562000a0357600080fd5b505062000a138682870162000729565b9150509250925092565b634e487b7160e01b600052603260045260246000fd5b600181811c9082168062000a4857607f821691505b60208210810362000a6957634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111562000abf576000816000526020600020601f850160051c8101602086101562000a9a5750805b601f850160051c820191505b8181101562000abb5782815560010162000aa6565b5050505b505050565b81516001600160401b0381111562000ae05762000ae06200066a565b62000af88162000af1845462000a33565b8462000a6f565b602080601f83116001811462000b30576000841562000b175750858301515b600019600386901b1c1916600185901b17855562000abb565b600085815260208120601f198616915b8281101562000b615788860151825594840194600190910190840162000b40565b508582101562000b805787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b602080825282546001600160a01b0381168383015260a081901c60ff161515604084015260a81c6001600160401b0316606083015260808083015260018084018054600093929190849062000be58162000a33565b8060a089015260c0600183166000811462000c09576001811462000c265762000c58565b60ff19841660c08b015260c083151560051b8b0101945062000c58565b85600052602060002060005b8481101562000c4f5781548c820185015290880190890162000c32565b8b0160c0019550505b50929998505050505050505050565b60805160a05160c05160e05161010051615f7462000cd6600039600081816102660152612a010152600081816102370152612f1d0152600081816102080152818161142b015261196d0152600081816101d801526125f00152600081816117f3015261183f0152615f746000f3fe608060405234801561001057600080fd5b50600436106101775760003560e01c806385572ffb116100d8578063ccd37ba31161008c578063f2fde38b11610066578063f2fde38b14610583578063f716f99f14610596578063ff888fb1146105a957600080fd5b8063ccd37ba31461050b578063d2a15d3514610550578063e9d68a8e1461056357600080fd5b8063991a5018116100bd578063991a5018146104c5578063a80036b4146104d8578063c673e584146104eb57600080fd5b806385572ffb1461049c5780638da5cb5b146104aa57600080fd5b8063311cd5131161012f5780635e36480c116101145780635e36480c146103785780637437ff9f1461039857806379ba50971461049457600080fd5b8063311cd513146103495780633f4b04aa1461035c57600080fd5b806306285c691161016057806306285c69146101a4578063181f5a77146102ed5780632d04ab761461033657600080fd5b806304666f9c1461017c57806305d938b514610191575b600080fd5b61018f61018a3660046140d8565b6105cc565b005b61018f61019f366004614764565b6105e0565b61029660408051608081018252600080825260208201819052918101829052606081019190915260405180608001604052807f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff1681526020017f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031681526020017f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031681526020017f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316815250905090565b6040516102e49190815167ffffffffffffffff1681526020808301516001600160a01b0390811691830191909152604080840151821690830152606092830151169181019190915260800190565b60405180910390f35b6103296040518060400160405280601181526020017f4f666652616d7020312e362e302d64657600000000000000000000000000000081525081565b6040516102e491906148df565b61018f61034436600461498a565b610785565b61018f610357366004614a3d565b610b5c565b60095460405167ffffffffffffffff90911681526020016102e4565b61038b610386366004614a91565b610bc5565b6040516102e49190614aee565b6104376040805160a081018252600080825260208201819052918101829052606081018290526080810191909152506040805160a0810182526004546001600160a01b03808216835263ffffffff600160a01b83048116602085015278010000000000000000000000000000000000000000000000008304811694840194909452600160e01b9091049092166060820152600554909116608082015290565b6040516102e49190600060a0820190506001600160a01b03808451168352602084015163ffffffff808216602086015280604087015116604086015280606087015116606086015250508060808501511660808401525092915050565b61018f610c1b565b61018f610177366004614afc565b6000546040516001600160a01b0390911681526020016102e4565b61018f6104d3366004614b4b565b610cd9565b61018f6104e6366004614bbf565b610cea565b6104fe6104f9366004614c2c565b61105d565b6040516102e49190614c8c565b610542610519366004614d01565b67ffffffffffffffff919091166000908152600860209081526040808320938352929052205490565b6040519081526020016102e4565b61018f61055e366004614d2b565b6111bb565b610576610571366004614da0565b611275565b6040516102e49190614dbb565b61018f610591366004614e09565b611382565b61018f6105a4366004614e8e565b611393565b6105bc6105b7366004614fcc565b6113d5565b60405190151581526020016102e4565b6105d4611496565b6105dd816114f2565b50565b6105e86117f0565b815181518114610624576040517f83e3f56400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60005b8181101561077557600084828151811061064357610643614fe5565b6020026020010151905060008160200151519050600085848151811061066b5761066b614fe5565b60200260200101519050805182146106af576040517f83e3f56400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60005b828110156107665760008282815181106106ce576106ce614fe5565b602002602001015190508060001461075d57846020015182815181106106f6576106f6614fe5565b60200260200101516080015181101561075d5784516040517fc8e9605100000000000000000000000000000000000000000000000000000000815267ffffffffffffffff909116600482015260248101839052604481018290526064015b60405180910390fd5b506001016106b2565b50505050806001019050610627565b506107808383611871565b505050565b60006107938789018961516b565b805151519091501515806107ac57508051602001515115155b156108ac5760095460208a01359067ffffffffffffffff8083169116101561086b576009805467ffffffffffffffff191667ffffffffffffffff83161790556004805483516040517f3937306f0000000000000000000000000000000000000000000000000000000081526001600160a01b0390921692633937306f92610834929101615393565b600060405180830381600087803b15801561084e57600080fd5b505af1158015610862573d6000803e3d6000fd5b505050506108aa565b8160200151516000036108aa576040517f2261116700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b505b60005b816020015151811015610aa5576000826020015182815181106108d4576108d4614fe5565b602002602001015190506000816000015190506108f081611921565b60006108fb82611a23565b602084015151815491925067ffffffffffffffff908116600160a81b9092041614158061093f575060208084015190810151905167ffffffffffffffff9182169116115b1561097f57825160208401516040517feefb0cac0000000000000000000000000000000000000000000000000000000081526107549291906004016153a6565b6040830151806109bb576040517f504570e300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b835167ffffffffffffffff16600090815260086020908152604080832084845290915290205415610a2e5783516040517f32cf0cbf00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff909116600482015260248101829052604401610754565b6020808501510151610a419060016153f1565b82547fffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffff16600160a81b67ffffffffffffffff9283160217909255925116600090815260086020908152604080832094835293905291909120429055506001016108af565b507f3a3950e13dd607cc37980db0ef14266c40d2bba9c01b2e44bfe549808883095d81604051610ad59190615419565b60405180910390a1610b5160008a8a8a8a8a8080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525050604080516020808e0282810182019093528d82529093508d92508c9182918501908490808284376000920191909152508b9250611a8a915050565b505050505050505050565b610b9c610b6b828401846154b6565b6040805160008082526020820190925290610b96565b6060815260200190600190039081610b815790505b50611871565b604080516000808252602082019092529050610bbf600185858585866000611a8a565b50505050565b6000610bd3600160046154eb565b6002610be0608085615514565b67ffffffffffffffff16610bf4919061553b565b610bfe8585611e01565b901c166003811115610c1257610c12614ac4565b90505b92915050565b6001546001600160a01b03163314610c755760405162461bcd60e51b815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e6572000000000000000000006044820152606401610754565b600080543373ffffffffffffffffffffffffffffffffffffffff19808316821784556001805490911690556040516001600160a01b0390921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b610ce1611496565b6105dd81611e48565b333014610d23576040517f371a732800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040805160008082526020820190925281610d60565b6040805180820190915260008082526020820152815260200190600190039081610d395790505b5060a08501515190915015610d9457610d918460a00151856020015186606001518760000151602001518787611fae565b90505b6040805160a0810182528551518152855160209081015167ffffffffffffffff1681830152808701518351600094840192610dd09291016148df565b60408051601f19818403018152918152908252878101516020830152018390526005549091506001600160a01b03168015610edd576040517f08d450a10000000000000000000000000000000000000000000000000000000081526001600160a01b038216906308d450a190610e4a9085906004016155f4565b600060405180830381600087803b158015610e6457600080fd5b505af1925050508015610e75575060015b610edd573d808015610ea3576040519150601f19603f3d011682016040523d82523d6000602084013e610ea8565b606091505b50806040517f09c2532500000000000000000000000000000000000000000000000000000000815260040161075491906148df565b604086015151158015610ef257506080860151155b80610f09575060608601516001600160a01b03163b155b80610f4957506060860151610f47906001600160a01b03167f85572ffb000000000000000000000000000000000000000000000000000000006120cd565b155b15610f5657505050505050565b855160209081015167ffffffffffffffff1660009081526006909152604080822054608089015160608a015192517f3cf9798300000000000000000000000000000000000000000000000000000000815284936001600160a01b0390931692633cf9798392610fce9289926113889291600401615607565b6000604051808303816000875af1158015610fed573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526110159190810190615643565b50915091508161105357806040517f0a8d6e8c00000000000000000000000000000000000000000000000000000000815260040161075491906148df565b5050505050505050565b6110a06040805160e081019091526000606082018181526080830182905260a0830182905260c08301919091528190815260200160608152602001606081525090565b60ff808316600090815260026020818152604092839020835160e081018552815460608201908152600183015480881660808401526101008104881660a0840152620100009004909616151560c08201529485529182018054845181840281018401909552808552929385830193909283018282801561114957602002820191906000526020600020905b81546001600160a01b0316815260019091019060200180831161112b575b50505050508152602001600382018054806020026020016040519081016040528092919081815260200182805480156111ab57602002820191906000526020600020905b81546001600160a01b0316815260019091019060200180831161118d575b5050505050815250509050919050565b6111c3611496565b60005b818110156107805760008383838181106111e2576111e2614fe5565b9050604002018036038101906111f891906156d9565b905061120781602001516113d5565b61126c57805167ffffffffffffffff1660009081526008602090815260408083208285018051855290835281842093909355915191519182527f202f1139a3e334b6056064c0e9b19fd07e44a88d8f6e5ded571b24cf8c371f12910160405180910390a15b506001016111c6565b604080516080808201835260008083526020808401829052838501829052606080850181905267ffffffffffffffff878116845260068352928690208651948501875280546001600160a01b0381168652600160a01b810460ff16151593860193909352600160a81b90920490921694830194909452600184018054939492939184019161130290615712565b80601f016020809104026020016040519081016040528092919081815260200182805461132e90615712565b80156111ab5780601f10611350576101008083540402835291602001916111ab565b820191906000526020600020905b81548152906001019060200180831161135e57505050919092525091949350505050565b61138a611496565b6105dd816120e9565b61139b611496565b60005b81518110156113d1576113c98282815181106113bc576113bc614fe5565b602002602001015161219f565b60010161139e565b5050565b6040805180820182523081526020810183815291517f4d61677100000000000000000000000000000000000000000000000000000000815290516001600160a01b039081166004830152915160248201526000917f00000000000000000000000000000000000000000000000000000000000000001690634d61677190604401602060405180830381865afa158015611472573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c15919061574c565b6000546001600160a01b031633146114f05760405162461bcd60e51b815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610754565b565b60005b81518110156113d157600082828151811061151257611512614fe5565b602002602001015190506000816020015190508067ffffffffffffffff16600003611569576040517fc656089500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b81516001600160a01b0316611591576040516342bcdf7f60e11b815260040160405180910390fd5b67ffffffffffffffff811660009081526006602052604081206001810180549192916115bc90615712565b80601f01602080910402602001604051908101604052809291908181526020018280546115e890615712565b80156116355780601f1061160a57610100808354040283529160200191611635565b820191906000526020600020905b81548152906001019060200180831161161857829003601f168201915b5050505050905060008460600151905081516000036116ed578051600003611670576040516342bcdf7f60e11b815260040160405180910390fd5b6001830161167e82826157b1565b5082547fffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffff16600160a81b17835560405167ffffffffffffffff851681527ff4c1390c70e5c0f491ae1ccbc06f9117cbbadf2767b247b3bc203280f24c0fb99060200160405180910390a1611740565b8080519060200120828051906020012014611740576040517fc39a620500000000000000000000000000000000000000000000000000000000815267ffffffffffffffff85166004820152602401610754565b604080860151845487516001600160a01b031673ffffffffffffffffffffffffffffffffffffffff19921515600160a01b02929092167fffffffffffffffffffffff000000000000000000000000000000000000000000909116171784555167ffffffffffffffff8516907f49f51971edd25182e97182d6ea372a0488ce2ab639f6a3a7ab4df0d2636fe56b906117d8908690615871565b60405180910390a250505050508060010190506114f5565b467f0000000000000000000000000000000000000000000000000000000000000000146114f0576040517f0f01ce850000000000000000000000000000000000000000000000000000000081527f00000000000000000000000000000000000000000000000000000000000000006004820152466024820152604401610754565b81516000036118ab576040517ebf199700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b805160408051600080825260208201909252911591905b845181101561191a576119128582815181106118e0576118e0614fe5565b60200260200101518461190c578583815181106118ff576118ff614fe5565b60200260200101516124e3565b836124e3565b6001016118c2565b5050505050565b6040517f2cbc26bb000000000000000000000000000000000000000000000000000000008152608082901b77ffffffffffffffff000000000000000000000000000000001660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690632cbc26bb90602401602060405180830381865afa1580156119bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119e0919061574c565b156105dd576040517ffdbd6a7200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff82166004820152602401610754565b67ffffffffffffffff811660009081526006602052604081208054600160a01b900460ff16610c15576040517fed053c5900000000000000000000000000000000000000000000000000000000815267ffffffffffffffff84166004820152602401610754565b60ff87811660009081526002602090815260408083208151608081018352815481526001909101548086169382019390935261010083048516918101919091526201000090910490921615156060830152873590611ae98760a461593f565b9050826060015115611b31578451611b0290602061553b565b8651611b0f90602061553b565b611b1a9060a061593f565b611b24919061593f565b611b2e908261593f565b90505b368114611b73576040517f8e1192e100000000000000000000000000000000000000000000000000000000815260048101829052366024820152604401610754565b5081518114611bbb5781516040517f93df584c000000000000000000000000000000000000000000000000000000008152600481019190915260248101829052604401610754565b611bc36117f0565b60ff808a1660009081526003602090815260408083203384528252808320815180830190925280548086168352939491939092840191610100909104166002811115611c1157611c11614ac4565b6002811115611c2257611c22614ac4565b9052509050600281602001516002811115611c3f57611c3f614ac4565b148015611c935750600260008b60ff1660ff168152602001908152602001600020600301816000015160ff1681548110611c7b57611c7b614fe5565b6000918252602090912001546001600160a01b031633145b611cc9576040517fda0f08e800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50816060015115611dab576020820151611ce4906001615952565b60ff16855114611d20576040517f71253a2500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8351855114611d5b576040517fa75d88af00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008787604051611d6d92919061596b565b604051908190038120611d84918b9060200161597b565b604051602081830303815290604052805190602001209050611da98a82888888612caf565b505b6040805182815260208a81013567ffffffffffffffff169082015260ff8b16917f198d6990ef96613a9026203077e422916918b03ff47f0be6bee7b02d8e139ef0910160405180910390a2505050505050505050565b67ffffffffffffffff8216600090815260076020526040812081611e2660808561598f565b67ffffffffffffffff1681526020810191909152604001600020549392505050565b80516001600160a01b0316611e70576040516342bcdf7f60e11b815260040160405180910390fd5b80516004805460208085018051604080880180516060808b0180516001600160a01b039b8c167fffffffffffffffff000000000000000000000000000000000000000000000000909a168a17600160a01b63ffffffff988916021777ffffffffffffffffffffffffffffffffffffffffffffffff167801000000000000000000000000000000000000000000000000948816949094026001600160e01b031693909317600160e01b93871693909302929092179098556080808b0180516005805473ffffffffffffffffffffffffffffffffffffffff1916918d169190911790558451988952955185169688019690965290518316918601919091525116938301939093529151909216908201527fa55bd56595c45f517e5967a3067f3dca684445a3080e7c04a4e0d5a40cda627d9060a00160405180910390a150565b6060865167ffffffffffffffff811115611fca57611fca613eef565b60405190808252806020026020018201604052801561200f57816020015b6040805180820190915260008082526020820152815260200190600190039081611fe85790505b50905060005b87518110156120c15761209c88828151811061203357612033614fe5565b602002602001015188888888888781811061205057612050614fe5565b905060200281019061206291906159b6565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250612ebc92505050565b8282815181106120ae576120ae614fe5565b6020908102919091010152600101612015565b505b9695505050505050565b60006120d883613261565b8015610c125750610c1283836132c5565b336001600160a01b038216036121415760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610754565b6001805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b806040015160ff166000036121ca576000604051631b3fab5160e11b81526004016107549190615a1b565b60208082015160ff8082166000908152600290935260408320600181015492939092839216900361223757606084015160018201805491151562010000027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ffff90921691909117905561228c565b6060840151600182015460ff620100009091041615159015151461228c576040517f87f6037c00000000000000000000000000000000000000000000000000000000815260ff84166004820152602401610754565b60a08401518051601f60ff821611156122bb576001604051631b3fab5160e11b81526004016107549190615a1b565b612321858560030180548060200260200160405190810160405280929190818152602001828054801561231757602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116122f9575b5050505050613380565b8560600151156124505761238f8585600201805480602002602001604051908101604052809291908181526020018280548015612317576020028201919060005260206000209081546001600160a01b031681526001909101906020018083116122f9575050505050613380565b608086015180516123a99060028701906020840190613e49565b5080516001850180547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff1661010060ff841690810291909117909155601f1015612409576002604051631b3fab5160e11b81526004016107549190615a1b565b6040880151612419906003615a35565b60ff168160ff1611612441576003604051631b3fab5160e11b81526004016107549190615a1b565b61244d878360016133e9565b50505b61245c858360026133e9565b81516124719060038601906020850190613e49565b5060408681015160018501805460ff191660ff8316179055875180865560a089015192517fab8b1b57514019638d7b5ce9c638fe71366fe8e2be1c40a7a80f1733d0e9f547936124ca938a939260028b01929190615a51565b60405180910390a16124db85613569565b505050505050565b81516124ee81611921565b60006124f982611a23565b602085015151909150600081900361253c576040517ebf199700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b846040015151811461257a576040517f57e0e08300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008167ffffffffffffffff81111561259557612595613eef565b6040519080825280602002602001820160405280156125be578160200160208202803683370190505b50905060005b82811015612733576000876020015182815181106125e4576125e4614fe5565b602002602001015190507f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff1681600001516040015167ffffffffffffffff161461267757805160409081015190517f38432a2200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff9091166004820152602401610754565b61270d8186600101805461268a90615712565b80601f01602080910402602001604051908101604052809291908181526020018280546126b690615712565b80156127035780601f106126d857610100808354040283529160200191612703565b820191906000526020600020905b8154815290600101906020018083116126e657829003601f168201915b5050505050613585565b83838151811061271f5761271f614fe5565b6020908102919091010152506001016125c4565b50600061274a858389606001518a608001516136a7565b905080600003612792576040517f7dd17a7e00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff86166004820152602401610754565b8551151560005b84811015610b515760005a905060008a6020015183815181106127be576127be614fe5565b6020026020010151905060006127dc8a836000015160600151610bc5565b905060008160038111156127f2576127f2614ac4565b148061280f5750600381600381111561280d5761280d614ac4565b145b612867578151606001516040805167ffffffffffffffff808e16825290921660208301527f3b575419319662b2a6f5e2467d84521517a3382b908eb3d557bb3fdb0c50e23c91015b60405180910390a1505050612ca7565b841561293757600454600090600160a01b900463ffffffff1661288a88426154eb565b11905080806128aa575060038260038111156128a8576128a8614ac4565b145b6128ec576040517fa9cfc86200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8c166004820152602401610754565b8b85815181106128fe576128fe614fe5565b6020026020010151600014612931578b858151811061291f5761291f614fe5565b60200260200101518360800181815250505b50612998565b600081600381111561294b5761294b614ac4565b14612998578151606001516040805167ffffffffffffffff808e16825290921660208301527f3ef2a99c550a751d4b0b261268f05a803dfb049ab43616a1ffb388f61fe651209101612857565b81516080015167ffffffffffffffff1615612a875760008160038111156129c1576129c1614ac4565b03612a875781516080015160208301516040517fe0e03cae0000000000000000000000000000000000000000000000000000000081526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169263e0e03cae92612a38928f929190600401615afd565b6020604051808303816000875af1158015612a57573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612a7b919061574c565b612a8757505050612ca7565b60008c604001518581518110612a9f57612a9f614fe5565b6020026020010151905080518360a001515114612b03578251606001516040517f1cfe6d8b00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff808e1660048301529091166024820152604401610754565b612b178b84600001516060015160016136fd565b600080612b2485846137a5565b91509150612b3b8d866000015160600151846136fd565b8715612bab576003826003811115612b5557612b55614ac4565b03612bab576000846003811115612b6e57612b6e614ac4565b14612bab578451516040517f2b11b8d900000000000000000000000000000000000000000000000000000000815261075491908390600401615b2a565b6002826003811115612bbf57612bbf614ac4565b14612c19576003826003811115612bd857612bd8614ac4565b14612c19578451606001516040517f926c5a3e000000000000000000000000000000000000000000000000000000008152610754918f918590600401615b43565b84600001516000015185600001516060015167ffffffffffffffff168e67ffffffffffffffff167f05665fe9ad095383d018353f4cbcba77e84db27dd215081bbf7cdf9ae6fbe48b8d8b81518110612c7357612c73614fe5565b602002602001015186865a612c88908e6154eb565b604051612c989493929190615b69565b60405180910390a45050505050505b600101612799565b612cb7613ebb565b835160005b81811015611053576000600188868460208110612cdb57612cdb614fe5565b612ce891901a601b615952565b898581518110612cfa57612cfa614fe5565b6020026020010151898681518110612d1457612d14614fe5565b602002602001015160405160008152602001604052604051612d52949392919093845260ff9290921660208401526040830152606082015260800190565b6020604051602081039080840390855afa158015612d74573d6000803e3d6000fd5b505060408051601f1981015160ff808e166000908152600360209081528582206001600160a01b03851683528152858220858701909652855480841686529397509095509293928401916101009004166002811115612dd557612dd5614ac4565b6002811115612de657612de6614ac4565b9052509050600181602001516002811115612e0357612e03614ac4565b14612e3a576040517fca31867a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8051859060ff16601f8110612e5157612e51614fe5565b602002015115612e8d576040517ff67bc7c400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600185826000015160ff16601f8110612ea857612ea8614fe5565b911515602090920201525050600101612cbc565b60408051808201909152600080825260208201526000612edf876020015161386f565b6040517fbbe4f6db0000000000000000000000000000000000000000000000000000000081526001600160a01b0380831660048301529192506000917f0000000000000000000000000000000000000000000000000000000000000000169063bbe4f6db90602401602060405180830381865afa158015612f64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f889190615ba0565b90506001600160a01b0381161580612fd05750612fce6001600160a01b0382167faff2afbf000000000000000000000000000000000000000000000000000000006120cd565b155b15613012576040517fae9b4ce90000000000000000000000000000000000000000000000000000000081526001600160a01b0382166004820152602401610754565b60045460009081906130349089908690600160e01b900463ffffffff16613915565b9150915060008060006131016040518061010001604052808e81526020018c67ffffffffffffffff1681526020018d6001600160a01b031681526020018f606001518152602001896001600160a01b031681526020018f6000015181526020018f6040015181526020018b8152506040516024016130b29190615bbd565b60408051601f198184030181529190526020810180516001600160e01b03167f390775370000000000000000000000000000000000000000000000000000000017905287866113886084613a43565b9250925092508261314057816040517fe1cd550900000000000000000000000000000000000000000000000000000000815260040161075491906148df565b81516020146131885781516040517f78ef8024000000000000000000000000000000000000000000000000000000008152602060048201526024810191909152604401610754565b60008280602001905181019061319e9190615c8a565b9050866001600160a01b03168c6001600160a01b0316146132335760006131cf8d8a6131ca868a6154eb565b613915565b509050868110806131e95750816131e688836154eb565b14155b15613231576040517fa966e21f000000000000000000000000000000000000000000000000000000008152600481018390526024810188905260448101829052606401610754565b505b604080518082019091526001600160a01b039098168852602088015250949550505050505095945050505050565b600061328d827f01ffc9a7000000000000000000000000000000000000000000000000000000006132c5565b8015610c1557506132be827fffffffff000000000000000000000000000000000000000000000000000000006132c5565b1592915050565b6040517fffffffff0000000000000000000000000000000000000000000000000000000082166024820152600090819060440160408051601f19818403018152919052602080820180516001600160e01b03167f01ffc9a700000000000000000000000000000000000000000000000000000000178152825192935060009283928392909183918a617530fa92503d91506000519050828015613369575060208210155b80156133755750600081115b979650505050505050565b60005b81518110156107805760ff8316600090815260036020526040812083519091908490849081106133b5576133b5614fe5565b6020908102919091018101516001600160a01b03168252810191909152604001600020805461ffff19169055600101613383565b60005b82518160ff161015610bbf576000838260ff168151811061340f5761340f614fe5565b602002602001015190506000600281111561342c5761342c614ac4565b60ff80871660009081526003602090815260408083206001600160a01b0387168452909152902054610100900416600281111561346b5761346b614ac4565b1461348c576004604051631b3fab5160e11b81526004016107549190615a1b565b6001600160a01b0381166134cc576040517fd6c62c9b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60405180604001604052808360ff1681526020018460028111156134f2576134f2614ac4565b905260ff80871660009081526003602090815260408083206001600160a01b0387168452825290912083518154931660ff198416811782559184015190929091839161ffff19161761010083600281111561354f5761354f614ac4565b0217905550905050508061356290615ca3565b90506133ec565b60ff81166105dd576009805467ffffffffffffffff1916905550565b8151602080820151604092830151925160009384936135cb937f2425b0b9f9054c76ff151b0a175b18f37a4a4e82013a72e9f15c9caa095ed21f93909291889101615cc2565b60408051601f1981840301815290829052805160209182012086518051888401516060808b0151908401516080808d015195015195976136149794969395929491939101615cf5565b604051602081830303815290604052805190602001208560400151805190602001208660a0015160405160200161364b9190615e07565b60408051601f198184030181528282528051602091820120908301969096528101939093526060830191909152608082015260a081019190915260c0015b60405160208183030381529060405280519060200120905092915050565b6000806136b5858585613b69565b90506136c0816113d5565b6136ce5760009150506136f5565b67ffffffffffffffff86166000908152600860209081526040808320938352929052205490505b949350505050565b6000600261370c608085615514565b67ffffffffffffffff16613720919061553b565b9050600061372e8585611e01565b90508161373d600160046154eb565b901b19168183600381111561375457613754614ac4565b67ffffffffffffffff871660009081526007602052604081209190921b9290921791829161378360808861598f565b67ffffffffffffffff1681526020810191909152604001600020555050505050565b6040517fa80036b4000000000000000000000000000000000000000000000000000000008152600090606090309063a80036b4906137e99087908790600401615e67565b600060405180830381600087803b15801561380357600080fd5b505af1925050508015613814575060015b613853573d808015613842576040519150601f19603f3d011682016040523d82523d6000602084013e613847565b606091505b50600392509050613868565b50506040805160208101909152600081526002905b9250929050565b600081516020146138ae57816040517f8d666f6000000000000000000000000000000000000000000000000000000000815260040161075491906148df565b6000828060200190518101906138c49190615c8a565b90506001600160a01b038111806138dc575061040081105b15610c1557826040517f8d666f6000000000000000000000000000000000000000000000000000000000815260040161075491906148df565b600080600080600061398f8860405160240161394091906001600160a01b0391909116815260200190565b60408051601f198184030181529190526020810180516001600160e01b03167f70a082310000000000000000000000000000000000000000000000000000000017905288886113886084613a43565b925092509250826139ce57816040517fe1cd550900000000000000000000000000000000000000000000000000000000815260040161075491906148df565b6020825114613a165781516040517f78ef8024000000000000000000000000000000000000000000000000000000008152602060048201526024810191909152604401610754565b81806020019051810190613a2a9190615c8a565b613a3482886154eb565b94509450505050935093915050565b6000606060008361ffff1667ffffffffffffffff811115613a6657613a66613eef565b6040519080825280601f01601f191660200182016040528015613a90576020820181803683370190505b509150863b613ac3577f0c3b563c0000000000000000000000000000000000000000000000000000000060005260046000fd5b5a85811015613af6577fafa32a2c0000000000000000000000000000000000000000000000000000000060005260046000fd5b8590036040810481038710613b2f577f37c3be290000000000000000000000000000000000000000000000000000000060005260046000fd5b505a6000808a5160208c0160008c8cf193505a900390503d84811115613b525750835b808352806000602085013e50955095509592505050565b8251825160009190818303613baa576040517f11a6b26400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6101018211801590613bbe57506101018111155b613bdb576040516309bde33960e01b815260040160405180910390fd5b60001982820101610100811115613c05576040516309bde33960e01b815260040160405180910390fd5b80600003613c325786600081518110613c2057613c20614fe5565b60200260200101519350505050613e01565b60008167ffffffffffffffff811115613c4d57613c4d613eef565b604051908082528060200260200182016040528015613c76578160200160208202803683370190505b50905060008080805b85811015613da05760006001821b8b811603613cda5788851015613cc3578c5160018601958e918110613cb457613cb4614fe5565b60200260200101519050613cfc565b8551600185019487918110613cb457613cb4614fe5565b8b5160018401938d918110613cf157613cf1614fe5565b602002602001015190505b600089861015613d2c578d5160018701968f918110613d1d57613d1d614fe5565b60200260200101519050613d4e565b8651600186019588918110613d4357613d43614fe5565b602002602001015190505b82851115613d6f576040516309bde33960e01b815260040160405180910390fd5b613d798282613e08565b878481518110613d8b57613d8b614fe5565b60209081029190910101525050600101613c7f565b506001850382148015613db257508683145b8015613dbd57508581145b613dda576040516309bde33960e01b815260040160405180910390fd5b836001860381518110613def57613def614fe5565b60200260200101519750505050505050505b9392505050565b6000818310613e2057613e1b8284613e26565b610c12565b610c1283835b604080516001602082015290810183905260608101829052600090608001613689565b828054828255906000526020600020908101928215613eab579160200282015b82811115613eab578251825473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b03909116178255602090920191600190910190613e69565b50613eb7929150613eda565b5090565b604051806103e00160405280601f906020820280368337509192915050565b5b80821115613eb75760008155600101613edb565b634e487b7160e01b600052604160045260246000fd5b6040516080810167ffffffffffffffff81118282101715613f2857613f28613eef565b60405290565b60405160a0810167ffffffffffffffff81118282101715613f2857613f28613eef565b60405160c0810167ffffffffffffffff81118282101715613f2857613f28613eef565b6040805190810167ffffffffffffffff81118282101715613f2857613f28613eef565b6040516060810167ffffffffffffffff81118282101715613f2857613f28613eef565b604051601f8201601f1916810167ffffffffffffffff81118282101715613fe357613fe3613eef565b604052919050565b600067ffffffffffffffff82111561400557614005613eef565b5060051b60200190565b6001600160a01b03811681146105dd57600080fd5b803567ffffffffffffffff8116811461403c57600080fd5b919050565b80151581146105dd57600080fd5b803561403c81614041565b600067ffffffffffffffff82111561407457614074613eef565b50601f01601f191660200190565b600082601f83011261409357600080fd5b81356140a66140a18261405a565b613fba565b8181528460208386010111156140bb57600080fd5b816020850160208301376000918101602001919091529392505050565b600060208083850312156140eb57600080fd5b823567ffffffffffffffff8082111561410357600080fd5b818501915085601f83011261411757600080fd5b81356141256140a182613feb565b81815260059190911b8301840190848101908883111561414457600080fd5b8585015b838110156141ea578035858111156141605760008081fd5b86016080818c03601f19018113156141785760008081fd5b614180613f05565b8983013561418d8161400f565b8152604061419c848201614024565b8b8301526060808501356141af81614041565b838301529284013592898411156141c857600091508182fd5b6141d68f8d86880101614082565b908301525085525050918601918601614148565b5098975050505050505050565b600060a0828403121561420957600080fd5b614211613f2e565b90508135815261422360208301614024565b602082015261423460408301614024565b604082015261424560608301614024565b606082015261425660808301614024565b608082015292915050565b803561403c8161400f565b600082601f83011261427d57600080fd5b8135602061428d6140a183613feb565b82815260059290921b840181019181810190868411156142ac57600080fd5b8286015b848110156120c157803567ffffffffffffffff808211156142d15760008081fd5b818901915060a080601f19848d030112156142ec5760008081fd5b6142f4613f2e565b87840135838111156143065760008081fd5b6143148d8a83880101614082565b8252506040808501358481111561432b5760008081fd5b6143398e8b83890101614082565b8a84015250606080860135858111156143525760008081fd5b6143608f8c838a0101614082565b838501525060809150818601358184015250828501359250838311156143865760008081fd5b6143948d8a85880101614082565b9082015286525050509183019183016142b0565b600061014082840312156143bb57600080fd5b6143c3613f51565b90506143cf83836141f7565b815260a082013567ffffffffffffffff808211156143ec57600080fd5b6143f885838601614082565b602084015260c084013591508082111561441157600080fd5b61441d85838601614082565b604084015261442e60e08501614261565b6060840152610100840135608084015261012084013591508082111561445357600080fd5b506144608482850161426c565b60a08301525092915050565b600082601f83011261447d57600080fd5b8135602061448d6140a183613feb565b82815260059290921b840181019181810190868411156144ac57600080fd5b8286015b848110156120c157803567ffffffffffffffff8111156144d05760008081fd5b6144de8986838b01016143a8565b8452509183019183016144b0565b600082601f8301126144fd57600080fd5b8135602061450d6140a183613feb565b82815260059290921b8401810191818101908684111561452c57600080fd5b8286015b848110156120c157803567ffffffffffffffff8082111561455057600080fd5b818901915089603f83011261456457600080fd5b858201356145746140a182613feb565b81815260059190911b830160400190878101908c83111561459457600080fd5b604085015b838110156145cd578035858111156145b057600080fd5b6145bf8f6040838a0101614082565b845250918901918901614599565b50875250505092840192508301614530565b600082601f8301126145f057600080fd5b813560206146006140a183613feb565b8083825260208201915060208460051b87010193508684111561462257600080fd5b602086015b848110156120c15780358352918301918301614627565b600082601f83011261464f57600080fd5b8135602061465f6140a183613feb565b82815260059290921b8401810191818101908684111561467e57600080fd5b8286015b848110156120c157803567ffffffffffffffff808211156146a35760008081fd5b818901915060a080601f19848d030112156146be5760008081fd5b6146c6613f2e565b6146d1888501614024565b8152604080850135848111156146e75760008081fd5b6146f58e8b8389010161446c565b8a840152506060808601358581111561470e5760008081fd5b61471c8f8c838a01016144ec565b83850152506080915081860135858111156147375760008081fd5b6147458f8c838a01016145df565b9184019190915250919093013590830152508352918301918301614682565b600080604080848603121561477857600080fd5b833567ffffffffffffffff8082111561479057600080fd5b61479c8783880161463e565b94506020915081860135818111156147b357600080fd5b8601601f810188136147c457600080fd5b80356147d26140a182613feb565b81815260059190911b8201840190848101908a8311156147f157600080fd5b8584015b8381101561487d5780358681111561480d5760008081fd5b8501603f81018d1361481f5760008081fd5b8781013561482f6140a182613feb565b81815260059190911b82018a0190898101908f83111561484f5760008081fd5b928b01925b8284101561486d5783358252928a0192908a0190614854565b86525050509186019186016147f5565b50809750505050505050509250929050565b60005b838110156148aa578181015183820152602001614892565b50506000910152565b600081518084526148cb81602086016020860161488f565b601f01601f19169290920160200192915050565b602081526000610c1260208301846148b3565b8060608101831015610c1557600080fd5b60008083601f84011261491557600080fd5b50813567ffffffffffffffff81111561492d57600080fd5b60208301915083602082850101111561386857600080fd5b60008083601f84011261495757600080fd5b50813567ffffffffffffffff81111561496f57600080fd5b6020830191508360208260051b850101111561386857600080fd5b60008060008060008060008060e0898b0312156149a657600080fd5b6149b08a8a6148f2565b9750606089013567ffffffffffffffff808211156149cd57600080fd5b6149d98c838d01614903565b909950975060808b01359150808211156149f257600080fd5b6149fe8c838d01614945565b909750955060a08b0135915080821115614a1757600080fd5b50614a248b828c01614945565b999c989b50969995989497949560c00135949350505050565b600080600060808486031215614a5257600080fd5b614a5c85856148f2565b9250606084013567ffffffffffffffff811115614a7857600080fd5b614a8486828701614903565b9497909650939450505050565b60008060408385031215614aa457600080fd5b614aad83614024565b9150614abb60208401614024565b90509250929050565b634e487b7160e01b600052602160045260246000fd5b60048110614aea57614aea614ac4565b9052565b60208101610c158284614ada565b600060208284031215614b0e57600080fd5b813567ffffffffffffffff811115614b2557600080fd5b820160a08185031215613e0157600080fd5b803563ffffffff8116811461403c57600080fd5b600060a08284031215614b5d57600080fd5b614b65613f2e565b8235614b708161400f565b8152614b7e60208401614b37565b6020820152614b8f60408401614b37565b6040820152614ba060608401614b37565b60608201526080830135614bb38161400f565b60808201529392505050565b600080600060408486031215614bd457600080fd5b833567ffffffffffffffff80821115614bec57600080fd5b614bf8878388016143a8565b94506020860135915080821115614c0e57600080fd5b50614a8486828701614945565b803560ff8116811461403c57600080fd5b600060208284031215614c3e57600080fd5b610c1282614c1b565b60008151808452602080850194506020840160005b83811015614c815781516001600160a01b031687529582019590820190600101614c5c565b509495945050505050565b60208152600082518051602084015260ff602082015116604084015260ff604082015116606084015260608101511515608084015250602083015160c060a0840152614cdb60e0840182614c47565b90506040840151601f198483030160c0850152614cf88282614c47565b95945050505050565b60008060408385031215614d1457600080fd5b614d1d83614024565b946020939093013593505050565b60008060208385031215614d3e57600080fd5b823567ffffffffffffffff80821115614d5657600080fd5b818501915085601f830112614d6a57600080fd5b813581811115614d7957600080fd5b8660208260061b8501011115614d8e57600080fd5b60209290920196919550909350505050565b600060208284031215614db257600080fd5b610c1282614024565b602081526001600160a01b03825116602082015260208201511515604082015267ffffffffffffffff6040830151166060820152600060608301516080808401526136f560a08401826148b3565b600060208284031215614e1b57600080fd5b8135613e018161400f565b600082601f830112614e3757600080fd5b81356020614e476140a183613feb565b8083825260208201915060208460051b870101935086841115614e6957600080fd5b602086015b848110156120c1578035614e818161400f565b8352918301918301614e6e565b60006020808385031215614ea157600080fd5b823567ffffffffffffffff80821115614eb957600080fd5b818501915085601f830112614ecd57600080fd5b8135614edb6140a182613feb565b81815260059190911b83018401908481019088831115614efa57600080fd5b8585015b838110156141ea57803585811115614f1557600080fd5b860160c0818c03601f19011215614f2c5760008081fd5b614f34613f51565b8882013581526040614f47818401614c1b565b8a8301526060614f58818501614c1b565b8284015260809150614f6b82850161404f565b9083015260a08381013589811115614f835760008081fd5b614f918f8d83880101614e26565b838501525060c0840135915088821115614fab5760008081fd5b614fb98e8c84870101614e26565b9083015250845250918601918601614efe565b600060208284031215614fde57600080fd5b5035919050565b634e487b7160e01b600052603260045260246000fd5b80356001600160e01b038116811461403c57600080fd5b600082601f83011261502357600080fd5b813560206150336140a183613feb565b82815260069290921b8401810191818101908684111561505257600080fd5b8286015b848110156120c1576040818903121561506f5760008081fd5b615077613f74565b61508082614024565b815261508d858301614ffb565b81860152835291830191604001615056565b600082601f8301126150b057600080fd5b813560206150c06140a183613feb565b82815260079290921b840181019181810190868411156150df57600080fd5b8286015b848110156120c15780880360808112156150fd5760008081fd5b615105613f97565b61510e83614024565b8152604080601f19840112156151245760008081fd5b61512c613f74565b9250615139878501614024565b8352615146818501614024565b83880152818701929092526060830135918101919091528352918301916080016150e3565b6000602080838503121561517e57600080fd5b823567ffffffffffffffff8082111561519657600080fd5b818501915060408083880312156151ac57600080fd5b6151b4613f74565b8335838111156151c357600080fd5b84016040818a0312156151d557600080fd5b6151dd613f74565b8135858111156151ec57600080fd5b8201601f81018b136151fd57600080fd5b803561520b6140a182613feb565b81815260069190911b8201890190898101908d83111561522a57600080fd5b928a01925b8284101561527a5787848f0312156152475760008081fd5b61524f613f74565b843561525a8161400f565b8152615267858d01614ffb565b818d0152825292870192908a019061522f565b84525050508187013593508484111561529257600080fd5b61529e8a858401615012565b81880152825250838501359150828211156152b857600080fd5b6152c48883860161509f565b85820152809550505050505092915050565b805160408084528151848201819052600092602091908201906060870190855b8181101561532d57835180516001600160a01b031684528501516001600160e01b03168584015292840192918501916001016152f6565b50508583015187820388850152805180835290840192506000918401905b80831015615387578351805167ffffffffffffffff1683528501516001600160e01b03168583015292840192600192909201919085019061534b565b50979650505050505050565b602081526000610c1260208301846152d6565b67ffffffffffffffff8316815260608101613e016020830184805167ffffffffffffffff908116835260209182015116910152565b634e487b7160e01b600052601160045260246000fd5b67ffffffffffffffff818116838216019080821115615412576154126153db565b5092915050565b60006020808352606084516040808487015261543860608701836152d6565b87850151878203601f19016040890152805180835290860193506000918601905b808310156141ea57845167ffffffffffffffff81511683528781015161549889850182805167ffffffffffffffff908116835260209182015116910152565b50840151828701529386019360019290920191608090910190615459565b6000602082840312156154c857600080fd5b813567ffffffffffffffff8111156154df57600080fd5b6136f58482850161463e565b81810381811115610c1557610c156153db565b634e487b7160e01b600052601260045260246000fd5b600067ffffffffffffffff8084168061552f5761552f6154fe565b92169190910692915050565b8082028115828204841417610c1557610c156153db565b805182526000602067ffffffffffffffff81840151168185015260408084015160a0604087015261558660a08701826148b3565b90506060850151868203606088015261559f82826148b3565b608087810151898303918a01919091528051808352908601935060009250908501905b8083101561538757835180516001600160a01b03168352860151868301529285019260019290920191908401906155c2565b602081526000610c126020830184615552565b60808152600061561a6080830187615552565b61ffff9590951660208301525060408101929092526001600160a01b0316606090910152919050565b60008060006060848603121561565857600080fd5b835161566381614041565b602085015190935067ffffffffffffffff81111561568057600080fd5b8401601f8101861361569157600080fd5b805161569f6140a18261405a565b8181528760208385010111156156b457600080fd5b6156c582602083016020860161488f565b809450505050604084015190509250925092565b6000604082840312156156eb57600080fd5b6156f3613f74565b6156fc83614024565b8152602083013560208201528091505092915050565b600181811c9082168061572657607f821691505b60208210810361574657634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561575e57600080fd5b8151613e0181614041565b601f821115610780576000816000526020600020601f850160051c810160208610156157925750805b601f850160051c820191505b818110156124db5782815560010161579e565b815167ffffffffffffffff8111156157cb576157cb613eef565b6157df816157d98454615712565b84615769565b602080601f83116001811461581457600084156157fc5750858301515b600019600386901b1c1916600185901b1785556124db565b600085815260208120601f198616915b8281101561584357888601518255948401946001909101908401615824565b50858210156158615787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000602080835283546001600160a01b038116602085015260ff8160a01c161515604085015267ffffffffffffffff8160a81c166060850152506001808501608080860152600081546158c381615712565b8060a089015260c060018316600081146158e4576001811461590057615930565b60ff19841660c08b015260c083151560051b8b01019450615930565b85600052602060002060005b848110156159275781548c820185015290880190890161590c565b8b0160c0019550505b50929998505050505050505050565b80820180821115610c1557610c156153db565b60ff8181168382160190811115610c1557610c156153db565b8183823760009101908152919050565b828152606082602083013760800192915050565b600067ffffffffffffffff808416806159aa576159aa6154fe565b92169190910492915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126159eb57600080fd5b83018035915067ffffffffffffffff821115615a0657600080fd5b60200191503681900382131561386857600080fd5b6020810160058310615a2f57615a2f614ac4565b91905290565b60ff8181168382160290811690818114615412576154126153db565b600060a0820160ff881683526020878185015260a0604085015281875480845260c0860191508860005282600020935060005b81811015615aa95784546001600160a01b031683526001948501949284019201615a84565b50508481036060860152865180825290820192508187019060005b81811015615ae95782516001600160a01b031685529383019391830191600101615ac4565b50505060ff851660808501525090506120c3565b600067ffffffffffffffff808616835280851660208401525060606040830152614cf860608301846148b3565b8281526040602082015260006136f560408301846148b3565b67ffffffffffffffff848116825283166020820152606081016136f56040830184614ada565b848152615b796020820185614ada565b608060408201526000615b8f60808301856148b3565b905082606083015295945050505050565b600060208284031215615bb257600080fd5b8151613e018161400f565b6020815260008251610100806020850152615bdc6101208501836148b3565b91506020850151615bf9604086018267ffffffffffffffff169052565b5060408501516001600160a01b038116606086015250606085015160808501526080850151615c3360a08601826001600160a01b03169052565b5060a0850151601f19808685030160c0870152615c5084836148b3565b935060c08701519150808685030160e0870152615c6d84836148b3565b935060e08701519150808685030183870152506120c383826148b3565b600060208284031215615c9c57600080fd5b5051919050565b600060ff821660ff8103615cb957615cb96153db565b60010192915050565b848152600067ffffffffffffffff8086166020840152808516604084015250608060608301526120c360808301846148b3565b86815260c060208201526000615d0e60c08301886148b3565b6001600160a01b039690961660408301525067ffffffffffffffff9384166060820152608081019290925290911660a09091015292915050565b600082825180855260208086019550808260051b84010181860160005b84811015615dfa57601f19868403018952815160a08151818652615d8b828701826148b3565b9150508582015185820387870152615da382826148b3565b91505060408083015186830382880152615dbd83826148b3565b92505050606080830151818701525060808083015192508582038187015250615de681836148b3565b9a86019a9450505090830190600101615d65565b5090979650505050505050565b602081526000610c126020830184615d48565b60008282518085526020808601955060208260051b8401016020860160005b84811015615dfa57601f19868403018952615e558383516148b3565b98840198925090830190600101615e39565b604081526000835180516040840152602081015167ffffffffffffffff80821660608601528060408401511660808601528060608401511660a08601528060808401511660c086015250505060208401516101408060e0850152615ecf6101808501836148b3565b915060408601517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc08086850301610100870152615f0c84836148b3565b935060608801519150615f2b6101208701836001600160a01b03169052565b60808801518387015260a0880151925080868503016101608701525050615f528282615d48565b9150508281036020840152614cf88185615e1a56fea164736f6c6343000818000a",
 }
 
 var OffRampABI = OffRampMetaData.ABI
@@ -1200,6 +1201,7 @@ type OffRampExecutionStateChanged struct {
 	SourceChainSelector uint64
 	SequenceNumber      uint64
 	MessageId           [32]byte
+	MessageHash         [32]byte
 	State               uint8
 	ReturnData          []byte
 	GasUsed             *big.Int
@@ -2333,7 +2335,7 @@ func (OffRampDynamicConfigSet) Topic() common.Hash {
 }
 
 func (OffRampExecutionStateChanged) Topic() common.Hash {
-	return common.HexToHash("0xdc8ccbc35e0eebd81239bcd1971fcd53c7eb34034880142a0f43c809a458732f")
+	return common.HexToHash("0x05665fe9ad095383d018353f4cbcba77e84db27dd215081bbf7cdf9ae6fbe48b")
 }
 
 func (OffRampOwnershipTransferRequested) Topic() common.Hash {
diff --git a/core/gethwrappers/ccip/generated/onramp/onramp.go b/core/gethwrappers/ccip/generated/onramp/onramp.go
index 5a77d6854f..dd2428a143 100644
--- a/core/gethwrappers/ccip/generated/onramp/onramp.go
+++ b/core/gethwrappers/ccip/generated/onramp/onramp.go
@@ -67,11 +67,14 @@ type InternalRampTokenAmount struct {
 	DestTokenAddress  []byte
 	ExtraData         []byte
 	Amount            *big.Int
+	DestExecData      []byte
 }
 
-type OnRampDestChainConfig struct {
-	SequenceNumber uint64
-	Router         common.Address
+type OnRampAllowListConfigArgs struct {
+	DestChainSelector         uint64
+	AllowListEnabled          bool
+	AddedAllowlistedSenders   []common.Address
+	RemovedAllowlistedSenders []common.Address
 }
 
 type OnRampDestChainConfigArgs struct {
@@ -80,9 +83,10 @@ type OnRampDestChainConfigArgs struct {
 }
 
 type OnRampDynamicConfig struct {
-	PriceRegistry    common.Address
+	FeeQuoter        common.Address
 	MessageValidator common.Address
 	FeeAggregator    common.Address
+	AllowListAdmin   common.Address
 }
 
 type OnRampStaticConfig struct {
@@ -93,8 +97,8 @@ type OnRampStaticConfig struct {
 }
 
 var OnRampMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.StaticConfig\",\"name\":\"staticConfig\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"priceRegistry\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"feeAggregator\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.DestChainConfigArgs[]\",\"name\":\"destChainConfigArgs\",\"type\":\"tuple[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"CannotSendZeroTokens\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"CursedByRMN\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"GetSupportedTokensFunctionalityRemovedCheckAdminRegistry\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidConfig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"InvalidDestChainConfig\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"MustBeCalledByRouter\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"RouterMustSetOriginalSender\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"UnsupportedToken\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"receiver\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraArgs\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"indexed\":false,\"internalType\":\"structInternal.EVM2AnyRampMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"CCIPSendRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structOnRamp.StaticConfig\",\"name\":\"staticConfig\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"priceRegistry\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"feeAggregator\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structOnRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"}],\"name\":\"ConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structOnRamp.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"name\":\"DestChainConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"feeValueJuels\",\"type\":\"uint256\"}],\"name\":\"FeePaid\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"feeAggregator\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"FeeTokenWithdrawn\",\"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\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.DestChainConfigArgs[]\",\"name\":\"destChainConfigArgs\",\"type\":\"tuple[]\"}],\"name\":\"applyDestChainConfigUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"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\"},{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"originalSender\",\"type\":\"address\"}],\"name\":\"forwardFromRouter\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getDynamicConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"priceRegistry\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"feeAggregator\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getExpectedNextSequenceNumber\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"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\":\"getFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"},{\"internalType\":\"contractIERC20\",\"name\":\"sourceToken\",\"type\":\"address\"}],\"name\":\"getPoolBySourceToken\",\"outputs\":[{\"internalType\":\"contractIPoolV1\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getRouter\",\"outputs\":[{\"internalType\":\"contractIRouter\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getStaticConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.StaticConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"name\":\"getSupportedTokens\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"priceRegistry\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"feeAggregator\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"}],\"name\":\"setDynamicConfig\",\"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\":[],\"name\":\"withdrawFeeTokens\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
-	Bin: "0x6101006040523480156200001257600080fd5b50604051620036af380380620036af83398101604081905262000035916200069c565b33806000816200008c5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000bf57620000bf8162000186565b505083516001600160401b031615905080620000e6575060208301516001600160a01b0316155b80620000fd575060408301516001600160a01b0316155b8062000114575060608301516001600160a01b0316155b1562000133576040516306b7c75960e31b815260040160405180910390fd5b82516001600160401b031660805260208301516001600160a01b0390811660a0526040840151811660c05260608401511660e052620001728262000231565b6200017d816200036d565b5050506200079c565b336001600160a01b03821603620001e05760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000083565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b80516001600160a01b0316158062000254575060408101516001600160a01b0316155b1562000273576040516306b7c75960e31b815260040160405180910390fd5b8051600280546001600160a01b03199081166001600160a01b03938416179091556020808401805160038054851691861691909117905560408086018051600480549096169087161790945580516080808201835280516001600160401b031680835260a08051891684880190815260c080518b1686880190815260e080518d166060988901908152895196875293518d169a86019a909a52518b169684019690965251891693820193909352885188169181019190915292518616908301529251909316918301919091527f2d8f19dc1cd01460c3367a09d2d424f2b1940ba7c886047edd078c7b77ea4558910160405180910390a150565b60005b8151811015620004aa57600082828151811062000391576200039162000786565b602002602001015190506000838381518110620003b257620003b262000786565b6020026020010151600001519050806001600160401b0316600003620003f75760405163c35aa79d60e01b81526001600160401b038216600482015260240162000083565b6040805180820182526001600160401b03838116600081815260056020818152868320805480871688528a8301516001600160a01b03908116848a019081529587905293835287518551851668010000000000000000026001600160e01b0319909216971696871717905586519485529151169083015291927f324d4a7950b57da00ce533ad6697039be6281726a73da959d0ab3ff795181ec6910160405180910390a250505080600101905062000370565b5050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b0381118282101715620004e957620004e9620004ae565b60405290565b604051601f8201601f191681016001600160401b03811182821017156200051a576200051a620004ae565b604052919050565b80516001600160401b03811681146200053a57600080fd5b919050565b6001600160a01b03811681146200055557600080fd5b50565b6000606082840312156200056b57600080fd5b604051606081016001600160401b0381118282101715620005905762000590620004ae565b80604052508091508251620005a5816200053f565b81526020830151620005b7816200053f565b60208201526040830151620005cc816200053f565b6040919091015292915050565b600082601f830112620005eb57600080fd5b815160206001600160401b03821115620006095762000609620004ae565b62000619818360051b01620004ef565b82815260069290921b840181019181810190868411156200063957600080fd5b8286015b84811015620006915760408189031215620006585760008081fd5b62000662620004c4565b6200066d8262000522565b8152848201516200067e816200053f565b818601528352918301916040016200063d565b509695505050505050565b6000806000838503610100811215620006b457600080fd5b6080811215620006c357600080fd5b50604051608081016001600160401b038082118383101715620006ea57620006ea620004ae565b81604052620006f98762000522565b8352602087015191506200070d826200053f565b8160208401526040870151915062000725826200053f565b816040840152606087015191506200073d826200053f565b81606084015282955062000755886080890162000558565b945060e08701519250808311156200076c57600080fd5b50506200077c86828701620005d9565b9150509250925092565b634e487b7160e01b600052603260045260246000fd5b60805160a05160c05160e051612e9a62000815600039600081816101eb015281816108a201526115da0152600081816101af01528181610dc601526115b3015260008181610173015281816104c4015261158901526000818161014301528181610cec0152818161117c015261155c0152612e9a6000f3fe608060405234801561001057600080fd5b50600436106100f55760003560e01c80637437ff9f11610097578063d77d5ed011610066578063d77d5ed0146103ba578063df0aa9e914610406578063f2fde38b14610419578063fbca3b741461042c57600080fd5b80637437ff9f146102fb57806379ba5097146103685780638da5cb5b146103705780639041be3d1461038e57600080fd5b806320487ded116100d357806320487ded1461028757806334d560e4146102a85780633a019940146102bb57806348a98aa4146102c357600080fd5b80630242cf60146100fa57806306285c691461010f578063181f5a771461023e575b600080fd5b61010d610108366004611fe6565b61044c565b005b61022860408051608081018252600080825260208201819052918101829052606081019190915260405180608001604052807f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16815250905090565b60405161023591906120a9565b60405180910390f35b61027a6040518060400160405280601081526020017f4f6e52616d7020312e362e302d6465760000000000000000000000000000000081525081565b604051610235919061216e565b61029a610295366004612199565b610460565b604051908152602001610235565b61010d6102b63660046121f9565b610619565b61010d61062a565b6102d66102d136600461226b565b61085a565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610235565b61035b6040805160608101825260008082526020820181905291810191909152506040805160608101825260025473ffffffffffffffffffffffffffffffffffffffff908116825260035481166020830152600454169181019190915290565b60405161023591906122a4565b61010d61090f565b60005473ffffffffffffffffffffffffffffffffffffffff166102d6565b6103a161039c3660046122e1565b610a0c565b60405167ffffffffffffffff9091168152602001610235565b6102d66103c83660046122e1565b67ffffffffffffffff1660009081526005602052604090205468010000000000000000900473ffffffffffffffffffffffffffffffffffffffff1690565b61029a6104143660046122fe565b610a35565b61010d61042736600461236a565b611230565b61043f61043a3660046122e1565b611241565b6040516102359190612387565b610454611275565b61045d816112f8565b50565b6040517f2cbc26bb00000000000000000000000000000000000000000000000000000000815277ffffffffffffffff00000000000000000000000000000000608084901b16600482015260009073ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001690632cbc26bb90602401602060405180830381865afa15801561050b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052f91906123f1565b15610577576040517ffdbd6a7200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff841660048201526024015b60405180910390fd5b6002546040517fd8694ccd00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091169063d8694ccd906105cf9086908690600401612520565b602060405180830381865afa1580156105ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106109190612669565b90505b92915050565b610621611275565b61045d81611470565b600254604080517fcdc73d51000000000000000000000000000000000000000000000000000000008152905160009273ffffffffffffffffffffffffffffffffffffffff169163cdc73d5191600480830192869291908290030181865afa158015610699573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526106df9190810190612682565b60045490915073ffffffffffffffffffffffffffffffffffffffff1660005b825181101561085557600083828151811061071b5761071b612711565b60209081029190910101516040517f70a0823100000000000000000000000000000000000000000000000000000000815230600482015290915060009073ffffffffffffffffffffffffffffffffffffffff8316906370a0823190602401602060405180830381865afa158015610796573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ba9190612669565b9050801561084b576107e373ffffffffffffffffffffffffffffffffffffffff8316858361163a565b8173ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167f508d7d183612c18fc339b42618912b9fa3239f631dd7ec0671f950200a0fa66e8360405161084291815260200190565b60405180910390a35b50506001016106fe565b505050565b6040517fbbe4f6db00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff82811660048301526000917f00000000000000000000000000000000000000000000000000000000000000009091169063bbe4f6db90602401602060405180830381865afa1580156108eb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106109190612740565b60015473ffffffffffffffffffffffffffffffffffffffff163314610990576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e657200000000000000000000604482015260640161056e565b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b67ffffffffffffffff80821660009081526005602052604081205490916106139116600161278c565b67ffffffffffffffff8416600090815260056020526040812073ffffffffffffffffffffffffffffffffffffffff8316610a9b576040517fa4ec747900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b805468010000000000000000900473ffffffffffffffffffffffffffffffffffffffff163314610af7576040517f1c0a352900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60035473ffffffffffffffffffffffffffffffffffffffff168015610b9d576040517fe0a0e50600000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff82169063e0a0e50690610b6a908a908a90600401612520565b600060405180830381600087803b158015610b8457600080fd5b505af1158015610b98573d6000803e3d6000fd5b505050505b506002546000908190819073ffffffffffffffffffffffffffffffffffffffff1663c4276bfc8a610bd460808c0160608d0161236a565b8a610be260808e018e6127b4565b6040518663ffffffff1660e01b8152600401610c02959493929190612819565b600060405180830381865afa158015610c1f573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0168201604052610c6591908101906128e1565b91945092509050610c7c6080890160608a0161236a565b73ffffffffffffffffffffffffffffffffffffffff167f075a2720282fdf622141dae0b048ef90a21a7e57c134c76912d19d006b3b3f6f84604051610cc391815260200190565b60405180910390a2604080516101a081019091526000610100820181815267ffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000081166101208501528c811661014085015287549293928392916101608401918a918791610d389116612938565b91906101000a81548167ffffffffffffffff021916908367ffffffffffffffff160217905567ffffffffffffffff16815260200186610e38576040517fea458c0c00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8f16600482015273ffffffffffffffffffffffffffffffffffffffff8c811660248301527f0000000000000000000000000000000000000000000000000000000000000000169063ea458c0c906044016020604051808303816000875af1158015610e0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e33919061295f565b610e3b565b60005b67ffffffffffffffff1681525081526020018873ffffffffffffffffffffffffffffffffffffffff1681526020018a8060200190610e7991906127b4565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250505090825250602001610ebd8b806127b4565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250505090825250602001610f0460808c018c6127b4565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250505090825250602001610f4e60808c0160608d0161236a565b73ffffffffffffffffffffffffffffffffffffffff1681526020018981526020018a8060400190610f7f919061297c565b905067ffffffffffffffff811115610f9957610f99611ee3565b604051908082528060200260200182016040528015610ff557816020015b610fe26040518060800160405280606081526020016060815260200160608152602001600081525090565b815260200190600190039081610fb75790505b509052905060005b61100a60408b018b61297c565b90508110156110b95761109061102360408c018c61297c565b8381811061103357611033612711565b90506040020180360381019061104991906129e4565b8c6110548d806127b4565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508e92506116c7915050565b8260e0015182815181106110a6576110a6612711565b6020908102919091010152600101610ffd565b5060025460e082015173ffffffffffffffffffffffffffffffffffffffff9091169063cc88924c908c906110f060408e018e61297c565b6040518563ffffffff1660e01b815260040161110f9493929190612ae0565b60006040518083038186803b15801561112757600080fd5b505afa15801561113b573d6000803e3d6000fd5b505050506080808201839052604080517f130ac867e79e2789f923760a88743d292acdf7002139a588206e2260f73f7321602082015267ffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000811692820192909252908c16606082015230918101919091526111d890829060a001604051602081830303815290604052805190602001206119d1565b81515260405167ffffffffffffffff8b16907f0f07cd31e53232da9125e517f09550fdde74bf43d6a0a76ebd41674dafe2ab2990611217908490612b16565b60405180910390a251519450505050505b949350505050565b611238611275565b61045d81611ad1565b60606040517f9e7177c800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60005473ffffffffffffffffffffffffffffffffffffffff1633146112f6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e657200000000000000000000604482015260640161056e565b565b60005b815181101561146c57600082828151811061131857611318612711565b60200260200101519050600083838151811061133657611336612711565b60200260200101516000015190508067ffffffffffffffff16600003611394576040517fc35aa79d00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8216600482015260240161056e565b60408051808201825267ffffffffffffffff838116600081815260056020818152868320805480871688528a83015173ffffffffffffffffffffffffffffffffffffffff908116848a019081529587905293835287518551851668010000000000000000027fffffffff00000000000000000000000000000000000000000000000000000000909216971696871717905586519485529151169083015291927f324d4a7950b57da00ce533ad6697039be6281726a73da959d0ab3ff795181ec6910160405180910390a25050508060010190506112fb565b5050565b805173ffffffffffffffffffffffffffffffffffffffff1615806114ac5750604081015173ffffffffffffffffffffffffffffffffffffffff16155b156114e3576040517f35be3ac800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8051600280547fffffffffffffffffffffffff000000000000000000000000000000000000000090811673ffffffffffffffffffffffffffffffffffffffff93841617909155602080840151600380548416918516919091179055604080850151600480549094169085161790925581516080810183527f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff1681527f00000000000000000000000000000000000000000000000000000000000000008416918101919091527f00000000000000000000000000000000000000000000000000000000000000008316818301527f00000000000000000000000000000000000000000000000000000000000000009092166060830152517f2d8f19dc1cd01460c3367a09d2d424f2b1940ba7c886047edd078c7b77ea45589161162f918490612c64565b60405180910390a150565b6040805173ffffffffffffffffffffffffffffffffffffffff8416602482015260448082018490528251808303909101815260649091019091526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fa9059cbb00000000000000000000000000000000000000000000000000000000179052610855908490611bc6565b6116f26040518060800160405280606081526020016060815260200160608152602001600081525090565b8460200151600003611730576040517f5cf0444900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061174085876000015161085a565b905073ffffffffffffffffffffffffffffffffffffffff8116158061181057506040517f01ffc9a70000000000000000000000000000000000000000000000000000000081527faff2afbf00000000000000000000000000000000000000000000000000000000600482015273ffffffffffffffffffffffffffffffffffffffff8216906301ffc9a790602401602060405180830381865afa1580156117ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061180e91906123f1565b155b156118625785516040517fbf16aab600000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff909116600482015260240161056e565b60008173ffffffffffffffffffffffffffffffffffffffff16639a4575b96040518060a001604052808881526020018967ffffffffffffffff1681526020018773ffffffffffffffffffffffffffffffffffffffff1681526020018a6020015181526020018a6000015173ffffffffffffffffffffffffffffffffffffffff168152506040518263ffffffff1660e01b81526004016119019190612cf6565b6000604051808303816000875af1158015611920573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526119669190810190612d6c565b604080516080810190915273ffffffffffffffffffffffffffffffffffffffff841660a08201529091508060c0810160405160208183030381529060405281526020018260000151815260200182602001518152602001886020015181525092505050949350505050565b60008060001b82846020015185606001518660000151606001518760000151608001518860a001518960c00151604051602001611a1396959493929190612dfd565b604051602081830303815290604052805190602001208560400151805190602001208660e00151604051602001611a4a9190612e5e565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815282825280516020918201206080808c0151805190840120928501989098529183019590955260608201939093529384015260a083015260c082015260e00160405160208183030381529060405280519060200120905092915050565b3373ffffffffffffffffffffffffffffffffffffffff821603611b50576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640161056e565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b6000611c28826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c65648152508573ffffffffffffffffffffffffffffffffffffffff16611cd29092919063ffffffff16565b8051909150156108555780806020019051810190611c4691906123f1565b610855576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e60448201527f6f74207375636365656400000000000000000000000000000000000000000000606482015260840161056e565b6060611ce18484600085611ceb565b90505b9392505050565b606082471015611d7d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f60448201527f722063616c6c0000000000000000000000000000000000000000000000000000606482015260840161056e565b6000808673ffffffffffffffffffffffffffffffffffffffff168587604051611da69190612e71565b60006040518083038185875af1925050503d8060008114611de3576040519150601f19603f3d011682016040523d82523d6000602084013e611de8565b606091505b5091509150611df987838387611e04565b979650505050505050565b60608315611e9a578251600003611e935773ffffffffffffffffffffffffffffffffffffffff85163b611e93576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640161056e565b5081611228565b6112288383815115611eaf5781518083602001fd5b806040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161056e919061216e565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715611f3557611f35611ee3565b60405290565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715611f8257611f82611ee3565b604052919050565b600067ffffffffffffffff821115611fa457611fa4611ee3565b5060051b60200190565b67ffffffffffffffff8116811461045d57600080fd5b73ffffffffffffffffffffffffffffffffffffffff8116811461045d57600080fd5b60006020808385031215611ff957600080fd5b823567ffffffffffffffff81111561201057600080fd5b8301601f8101851361202157600080fd5b803561203461202f82611f8a565b611f3b565b81815260069190911b8201830190838101908783111561205357600080fd5b928401925b82841015611df957604084890312156120715760008081fd5b612079611f12565b843561208481611fae565b81528486013561209381611fc4565b8187015282526040939093019290840190612058565b60808101610613828467ffffffffffffffff8151168252602081015173ffffffffffffffffffffffffffffffffffffffff808216602085015280604084015116604085015280606084015116606085015250505050565b60005b8381101561211b578181015183820152602001612103565b50506000910152565b6000815180845261213c816020860160208601612100565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b6020815260006106106020830184612124565b600060a0828403121561219357600080fd5b50919050565b600080604083850312156121ac57600080fd5b82356121b781611fae565b9150602083013567ffffffffffffffff8111156121d357600080fd5b6121df85828601612181565b9150509250929050565b80356121f481611fc4565b919050565b60006060828403121561220b57600080fd5b6040516060810181811067ffffffffffffffff8211171561222e5761222e611ee3565b604052823561223c81611fc4565b8152602083013561224c81611fc4565b6020820152604083013561225f81611fc4565b60408201529392505050565b6000806040838503121561227e57600080fd5b823561228981611fae565b9150602083013561229981611fc4565b809150509250929050565b606081016106138284805173ffffffffffffffffffffffffffffffffffffffff908116835260208083015182169084015260409182015116910152565b6000602082840312156122f357600080fd5b8135611ce481611fae565b6000806000806080858703121561231457600080fd5b843561231f81611fae565b9350602085013567ffffffffffffffff81111561233b57600080fd5b61234787828801612181565b93505060408501359150606085013561235f81611fc4565b939692955090935050565b60006020828403121561237c57600080fd5b8135611ce481611fc4565b6020808252825182820181905260009190848201906040850190845b818110156123d557835173ffffffffffffffffffffffffffffffffffffffff16835292840192918401916001016123a3565b50909695505050505050565b805180151581146121f457600080fd5b60006020828403121561240357600080fd5b610610826123e1565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261244157600080fd5b830160208101925035905067ffffffffffffffff81111561246157600080fd5b80360382131561247057600080fd5b9250929050565b8183528181602085013750600060208284010152600060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116840101905092915050565b8183526000602080850194508260005b858110156125155781356124e381611fc4565b73ffffffffffffffffffffffffffffffffffffffff1687528183013583880152604096870196909101906001016124d0565b509495945050505050565b600067ffffffffffffffff808516835260406020840152612541848561240c565b60a0604086015261255660e086018284612477565b915050612566602086018661240c565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc08087850301606088015261259c848385612477565b9350604088013592507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18836030183126125d557600080fd5b602092880192830192359150848211156125ee57600080fd5b8160061b360383131561260057600080fd5b808785030160808801526126158483856124c0565b9450612623606089016121e9565b73ffffffffffffffffffffffffffffffffffffffff811660a0890152935061264e608089018961240c565b94509250808786030160c08801525050611df9838383612477565b60006020828403121561267b57600080fd5b5051919050565b6000602080838503121561269557600080fd5b825167ffffffffffffffff8111156126ac57600080fd5b8301601f810185136126bd57600080fd5b80516126cb61202f82611f8a565b81815260059190911b820183019083810190878311156126ea57600080fd5b928401925b82841015611df957835161270281611fc4565b825292840192908401906126ef565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60006020828403121561275257600080fd5b8151611ce481611fc4565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b67ffffffffffffffff8181168382160190808211156127ad576127ad61275d565b5092915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126127e957600080fd5b83018035915067ffffffffffffffff82111561280457600080fd5b60200191503681900382131561247057600080fd5b67ffffffffffffffff8616815273ffffffffffffffffffffffffffffffffffffffff85166020820152836040820152608060608201526000611df9608083018486612477565b600082601f83011261287057600080fd5b815167ffffffffffffffff81111561288a5761288a611ee3565b6128bb60207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f84011601611f3b565b8181528460208386010111156128d057600080fd5b611228826020830160208701612100565b6000806000606084860312156128f657600080fd5b83519250612906602085016123e1565b9150604084015167ffffffffffffffff81111561292257600080fd5b61292e8682870161285f565b9150509250925092565b600067ffffffffffffffff8083168181036129555761295561275d565b6001019392505050565b60006020828403121561297157600080fd5b8151611ce481611fae565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126129b157600080fd5b83018035915067ffffffffffffffff8211156129cc57600080fd5b6020019150600681901b360382131561247057600080fd5b6000604082840312156129f657600080fd5b6129fe611f12565b8235612a0981611fc4565b81526020928301359281019290925250919050565b600082825180855260208086019550808260051b84010181860160005b84811015612ad3577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0868403018952815160808151818652612a7f82870182612124565b9150508582015185820387870152612a978282612124565b91505060408083015186830382880152612ab18382612124565b6060948501519790940196909652505098840198925090830190600101612a3b565b5090979650505050505050565b67ffffffffffffffff85168152606060208201526000612b036060830186612a1e565b8281036040840152611df98185876124c0565b60208152612b6760208201835180518252602081015167ffffffffffffffff808216602085015280604084015116604085015280606084015116606085015280608084015116608085015250505050565b60006020830151612b9060c084018273ffffffffffffffffffffffffffffffffffffffff169052565b5060408301516101808060e0850152612bad6101a0850183612124565b915060608501517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08086850301610100870152612bea8483612124565b9350608087015191508086850301610120870152612c088483612124565b935060a08701519150612c3461014087018373ffffffffffffffffffffffffffffffffffffffff169052565b60c087015161016087015260e0870151915080868503018387015250612c5a8382612a1e565b9695505050505050565b60e08101612cbb828567ffffffffffffffff8151168252602081015173ffffffffffffffffffffffffffffffffffffffff808216602085015280604084015116604085015280606084015116606085015250505050565b825173ffffffffffffffffffffffffffffffffffffffff90811660808401526020840151811660a084015260408401511660c0830152611ce4565b602081526000825160a06020840152612d1260c0840182612124565b905067ffffffffffffffff6020850151166040840152604084015173ffffffffffffffffffffffffffffffffffffffff8082166060860152606086015160808601528060808701511660a086015250508091505092915050565b600060208284031215612d7e57600080fd5b815167ffffffffffffffff80821115612d9657600080fd5b9083019060408286031215612daa57600080fd5b612db2611f12565b825182811115612dc157600080fd5b612dcd8782860161285f565b825250602083015182811115612de257600080fd5b612dee8782860161285f565b60208301525095945050505050565b600073ffffffffffffffffffffffffffffffffffffffff808916835260c06020840152612e2d60c0840189612124565b67ffffffffffffffff97881660408501529590961660608301525091909316608082015260a0019190915292915050565b6020815260006106106020830184612a1e565b60008251612e83818460208701612100565b919091019291505056fea164736f6c6343000818000a",
+	ABI: "[{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.StaticConfig\",\"name\":\"staticConfig\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"feeQuoter\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"feeAggregator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"allowListAdmin\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.DestChainConfigArgs[]\",\"name\":\"destChainConfigArgs\",\"type\":\"tuple[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"CannotSendZeroTokens\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"CursedByRMN\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"GetSupportedTokensFunctionalityRemovedCheckAdminRegistry\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"InvalidAllowListRequest\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidConfig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"}],\"name\":\"InvalidDestChainConfig\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"MustBeCalledByRouter\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableByOwnerOrAllowlistAdmin\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"RouterMustSetOriginalSender\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"SenderNotAllowed\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"UnsupportedToken\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"allowListAdmin\",\"type\":\"address\"}],\"name\":\"AllowListAdminSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"senders\",\"type\":\"address[]\"}],\"name\":\"AllowListSendersAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"senders\",\"type\":\"address[]\"}],\"name\":\"AllowListSendersRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"receiver\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraArgs\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"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.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"indexed\":false,\"internalType\":\"structInternal.EVM2AnyRampMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"CCIPSendRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structOnRamp.StaticConfig\",\"name\":\"staticConfig\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"feeQuoter\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"feeAggregator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"allowListAdmin\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structOnRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"}],\"name\":\"ConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"allowListEnabled\",\"type\":\"bool\"}],\"name\":\"DestChainConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"feeValueJuels\",\"type\":\"uint256\"}],\"name\":\"FeePaid\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"feeAggregator\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"feeToken\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"FeeTokenWithdrawn\",\"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\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"allowListEnabled\",\"type\":\"bool\"},{\"internalType\":\"address[]\",\"name\":\"addedAllowlistedSenders\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"removedAllowlistedSenders\",\"type\":\"address[]\"}],\"internalType\":\"structOnRamp.AllowListConfigArgs[]\",\"name\":\"allowListConfigArgsItems\",\"type\":\"tuple[]\"}],\"name\":\"applyAllowListUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"contractIRouter\",\"name\":\"router\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.DestChainConfigArgs[]\",\"name\":\"destChainConfigArgs\",\"type\":\"tuple[]\"}],\"name\":\"applyDestChainConfigUpdates\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"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\"},{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"originalSender\",\"type\":\"address\"}],\"name\":\"forwardFromRouter\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getAllowedSendersList\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getDestChainConfig\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"allowListEnabled\",\"type\":\"bool\"},{\"internalType\":\"address\",\"name\":\"router\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getDynamicConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"feeQuoter\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"feeAggregator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"allowListAdmin\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getExpectedNextSequenceNumber\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"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\":\"getFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"feeTokenAmount\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"},{\"internalType\":\"contractIERC20\",\"name\":\"sourceToken\",\"type\":\"address\"}],\"name\":\"getPoolBySourceToken\",\"outputs\":[{\"internalType\":\"contractIPoolV1\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"}],\"name\":\"getRouter\",\"outputs\":[{\"internalType\":\"contractIRouter\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getStaticConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"rmnProxy\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"nonceManager\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenAdminRegistry\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.StaticConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"name\":\"getSupportedTokens\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"feeQuoter\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"messageValidator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"feeAggregator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"allowListAdmin\",\"type\":\"address\"}],\"internalType\":\"structOnRamp.DynamicConfig\",\"name\":\"dynamicConfig\",\"type\":\"tuple\"}],\"name\":\"setDynamicConfig\",\"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\":[],\"name\":\"withdrawFeeTokens\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	Bin: "0x6101006040523480156200001257600080fd5b506040516200407338038062004073833981016040819052620000359162000665565b33806000816200008c5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000bf57620000bf8162000186565b505083516001600160401b031615905080620000e6575060208301516001600160a01b0316155b80620000fd575060408301516001600160a01b0316155b8062000114575060608301516001600160a01b0316155b1562000133576040516306b7c75960e31b815260040160405180910390fd5b82516001600160401b031660805260208301516001600160a01b0390811660a0526040840151811660c05260608401511660e052620001728262000231565b6200017d8162000390565b5050506200079f565b336001600160a01b03821603620001e05760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000083565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b80516001600160a01b0316158062000254575060408101516001600160a01b0316155b1562000273576040516306b7c75960e31b815260040160405180910390fd5b8051600280546001600160a01b03199081166001600160a01b0393841617909155602080840180516003805485169186169190911790556040808601805160048054871691881691909117905560608088018051600580549098169089161790965582516080808201855280516001600160401b031680835260a080518b16848a0190815260c080518d16868a0190815260e080518f169789019788528a5195865292518e169b85019b909b5299518c169783019790975292518a169381019390935289518916908301529351871693810193909352518516928201929092529151909216918101919091527f23a1adf8ad7fad6091a4803227af2cee848c01a7c812404cade7c25636925e32906101000160405180910390a150565b60005b8151811015620004cf576000828281518110620003b457620003b462000789565b602002602001015190506000838381518110620003d557620003d562000789565b6020026020010151600001519050806001600160401b03166000036200041a5760405163c35aa79d60e01b81526001600160401b038216600482015260240162000083565b6001600160401b03818116600081815260066020908152604091829020868201518154600160481b600160e81b0319811669010000000000000000006001600160a01b03909316928302908117808555865192891691909816178152928301526801000000000000000090940460ff161515918101919091527fd5ad72bc37dc7a80a8b9b9df20500046fd7341adb1be2258a540466fdd7dcef59060600160405180910390a250505080600101905062000393565b5050565b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b03811182821017156200050e576200050e620004d3565b60405290565b604080519081016001600160401b03811182821017156200050e576200050e620004d3565b604051601f8201601f191681016001600160401b0381118282101715620005645762000564620004d3565b604052919050565b80516001600160401b03811681146200058457600080fd5b919050565b6001600160a01b03811681146200059f57600080fd5b50565b600082601f830112620005b457600080fd5b815160206001600160401b03821115620005d257620005d2620004d3565b620005e2818360051b0162000539565b82815260069290921b840181019181810190868411156200060257600080fd5b8286015b848110156200065a5760408189031215620006215760008081fd5b6200062b62000514565b62000636826200056c565b815284820151620006478162000589565b8186015283529183019160400162000606565b509695505050505050565b60008060008385036101208112156200067d57600080fd5b60808112156200068c57600080fd5b62000696620004e9565b620006a1866200056c565b81526020860151620006b38162000589565b60208201526040860151620006c88162000589565b60408201526060860151620006dd8162000589565b606082015293506080607f1982011215620006f757600080fd5b5062000702620004e9565b6080850151620007128162000589565b815260a0850151620007248162000589565b602082015260c0850151620007398162000589565b604082015260e08501516200074e8162000589565b60608201526101008501519092506001600160401b038111156200077157600080fd5b6200077f86828701620005a2565b9150509250925092565b634e487b7160e01b600052603260045260246000fd5b60805160a05160c05160e05161385b620008186000396000818161022c01528181610c790152611beb0152600081816101f0015281816112480152611bc40152600081816101b4015281816105de0152611b9a0152600081816101840152818161116e015281816116930152611b6d015261385b6000f3fe608060405234801561001057600080fd5b50600436106101365760003560e01c806379ba5097116100b2578063a6f3ab6c11610081578063df0aa9e911610066578063df0aa9e91461052d578063f2fde38b14610540578063fbca3b741461055357600080fd5b8063a6f3ab6c146104cd578063d77d5ed0146104e057600080fd5b806379ba50971461045b5780638da5cb5b146104635780639041be3d14610481578063972b4612146104ad57600080fd5b806334adf4941161010957806348a98aa4116100ee57806348a98aa4146103045780636def4ce71461033c5780637437ff9f146103db57600080fd5b806334adf494146102e95780633a019940146102fc57600080fd5b80630242cf601461013b57806306285c6914610150578063181f5a771461027f57806320487ded146102c8575b600080fd5b61014e6101493660046126e0565b610566565b005b61026960408051608081018252600080825260208201819052918101829052606081019190915260405180608001604052807f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16815250905090565b60405161027691906127a3565b60405180910390f35b6102bb6040518060400160405280601081526020017f4f6e52616d7020312e362e302d6465760000000000000000000000000000000081525081565b6040516102769190612868565b6102db6102d6366004612893565b61057a565b604051908152602001610276565b61014e6102f73660046128e3565b610733565b61014e610a06565b610317610312366004612958565b610c31565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610276565b61039f61034a366004612991565b67ffffffffffffffff9081166000908152600660205260409020549081169168010000000000000000820460ff16916901000000000000000000900473ffffffffffffffffffffffffffffffffffffffff1690565b6040805167ffffffffffffffff9094168452911515602084015273ffffffffffffffffffffffffffffffffffffffff1690820152606001610276565b61044e604080516080810182526000808252602082018190529181018290526060810191909152506040805160808101825260025473ffffffffffffffffffffffffffffffffffffffff908116825260035481166020830152600454811692820192909252600554909116606082015290565b60405161027691906129ae565b61014e610ce6565b60005473ffffffffffffffffffffffffffffffffffffffff16610317565b61049461048f366004612991565b610de3565b60405167ffffffffffffffff9091168152602001610276565b6104c06104bb366004612991565b610e0c565b60405161027691906129f7565b61014e6104db366004612a61565b610e34565b6103176104ee366004612991565b67ffffffffffffffff166000908152600660205260409020546901000000000000000000900473ffffffffffffffffffffffffffffffffffffffff1690565b6102db61053b366004612ac8565b610e45565b61014e61054e366004612b34565b611748565b6104c0610561366004612991565b611759565b61056e61178d565b61057781611810565b50565b6040517f2cbc26bb00000000000000000000000000000000000000000000000000000000815277ffffffffffffffff00000000000000000000000000000000608084901b16600482015260009073ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001690632cbc26bb90602401602060405180830381865afa158015610625573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106499190612b5f565b15610691576040517ffdbd6a7200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff841660048201526024015b60405180910390fd5b6002546040517fd8694ccd00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091169063d8694ccd906106e99086908690600401612c90565b602060405180830381865afa158015610706573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061072a9190612dd9565b90505b92915050565b60005473ffffffffffffffffffffffffffffffffffffffff1633146107a35760055473ffffffffffffffffffffffffffffffffffffffff1633146107a3576040517f905d7d9b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60005b81811015610a015760008383838181106107c2576107c2612df2565b90506020028101906107d49190612e21565b6107dd90612ed2565b805167ffffffffffffffff1660009081526006602090815260409091209082015181547fffffffffffffffffffffffffffffffffffffffffffffff00ffffffffffffffff16680100000000000000009115801592909202178255919250906109545760005b8260400151518110156108fd5760008360400151828151811061086757610867612df2565b60200260200101519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16036108e65783516040517f463258ff00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff9091166004820152602401610688565b6108f36001840182611987565b5050600101610842565b506040820151511561095457816000015167ffffffffffffffff167f330939f6eafe8bb516716892fe962ff19770570838686e6579dbc1cc51fc3281836040015160405161094b91906129f7565b60405180910390a25b60005b8260600151518110156109a0576109978360600151828151811061097d5761097d612df2565b6020026020010151836001016119a990919063ffffffff16565b50600101610957565b50606082015151156109f757816000015167ffffffffffffffff167fc237ec1921f855ccd5e9a5af9733f2d58943a5a8501ec5988e305d7a4d42158683606001516040516109ee91906129f7565b60405180910390a25b50506001016107a6565b505050565b600254604080517fcdc73d51000000000000000000000000000000000000000000000000000000008152905160009273ffffffffffffffffffffffffffffffffffffffff169163cdc73d5191600480830192869291908290030181865afa158015610a75573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0168201604052610abb9190810190612f65565b60045490915073ffffffffffffffffffffffffffffffffffffffff1660005b8251811015610a01576000838281518110610af757610af7612df2565b60209081029190910101516040517f70a0823100000000000000000000000000000000000000000000000000000000815230600482015290915060009073ffffffffffffffffffffffffffffffffffffffff8316906370a0823190602401602060405180830381865afa158015610b72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b969190612dd9565b90508015610c2757610bbf73ffffffffffffffffffffffffffffffffffffffff831685836119cb565b8173ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167f508d7d183612c18fc339b42618912b9fa3239f631dd7ec0671f950200a0fa66e83604051610c1e91815260200190565b60405180910390a35b5050600101610ada565b6040517fbbe4f6db00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff82811660048301526000917f00000000000000000000000000000000000000000000000000000000000000009091169063bbe4f6db90602401602060405180830381865afa158015610cc2573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061072a9190612ff4565b60015473ffffffffffffffffffffffffffffffffffffffff163314610d67576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e6572000000000000000000006044820152606401610688565b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b67ffffffffffffffff808216600090815260066020526040812054909161072d91166001613040565b67ffffffffffffffff8116600090815260066020526040902060609061072d90600101611a58565b610e3c61178d565b61057781611a6c565b67ffffffffffffffff8416600090815260066020526040812073ffffffffffffffffffffffffffffffffffffffff8316610eab576040517fa4ec747900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b805468010000000000000000900460ff1615610f1c57610ece6001820184611c4e565b610f1c576040517fd0d2597600000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff84166004820152602401610688565b80546901000000000000000000900473ffffffffffffffffffffffffffffffffffffffff163314610f79576040517f1c0a352900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60035473ffffffffffffffffffffffffffffffffffffffff16801561101f576040517fe0a0e50600000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff82169063e0a0e50690610fec908a908a90600401612c90565b600060405180830381600087803b15801561100657600080fd5b505af115801561101a573d6000803e3d6000fd5b505050505b506002546000908190819073ffffffffffffffffffffffffffffffffffffffff1663c4276bfc8a61105660808c0160608d01612b34565b8a61106460808e018e613061565b6040518663ffffffff1660e01b81526004016110849594939291906130c6565b600060405180830381865afa1580156110a1573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526110e7919081019061318e565b919450925090506110fe6080890160608a01612b34565b73ffffffffffffffffffffffffffffffffffffffff167f075a2720282fdf622141dae0b048ef90a21a7e57c134c76912d19d006b3b3f6f8460405161114591815260200190565b60405180910390a2604080516101a081019091526000610100820181815267ffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000081166101208501528c811661014085015287549293928392916101608401918a9187916111ba91166131e8565b91906101000a81548167ffffffffffffffff021916908367ffffffffffffffff160217905567ffffffffffffffff168152602001866112ba576040517fea458c0c00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8f16600482015273ffffffffffffffffffffffffffffffffffffffff8c811660248301527f0000000000000000000000000000000000000000000000000000000000000000169063ea458c0c906044016020604051808303816000875af1158015611291573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112b5919061320f565b6112bd565b60005b67ffffffffffffffff1681525081526020018873ffffffffffffffffffffffffffffffffffffffff1681526020018a80602001906112fb9190613061565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525050509082525060200161133f8b80613061565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525050509082525060200161138660808c018c613061565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252506020016113d060808c0160608d01612b34565b73ffffffffffffffffffffffffffffffffffffffff1681526020018981526020018a8060400190611401919061322c565b905067ffffffffffffffff81111561141b5761141b6125ba565b60405190808252806020026020018201604052801561147e57816020015b61146b6040518060a0016040528060608152602001606081526020016060815260200160008152602001606081525090565b8152602001906001900390816114395790505b509052905060005b61149360408b018b61322c565b9050811015611542576115196114ac60408c018c61322c565b838181106114bc576114bc612df2565b9050604002018036038101906114d29190613294565b8c6114dd8d80613061565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508e9250611c7d915050565b8260e00151828151811061152f5761152f612df2565b6020908102919091010152600101611486565b5060025460e082015160009173ffffffffffffffffffffffffffffffffffffffff169063085318f8908d9061157a60408f018f61322c565b6040518563ffffffff1660e01b815260040161159994939291906133ab565b600060405180830381865afa1580156115b6573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526115fc91908101906133e1565b905060005b8260e00151518110156116555781818151811061162057611620612df2565b60200260200101518360e00151828151811061163e5761163e612df2565b602090810291909101015160800152600101611601565b506080808301849052604080517f130ac867e79e2789f923760a88743d292acdf7002139a588206e2260f73f7321602082015267ffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000811692820192909252908d16606082015230918101919091526116ef90839060a00160405160208183030381529060405280519060200120611fa3565b82515260405167ffffffffffffffff8c16907fcae3d9f68a9ed33d0a770e9bcc6fc25d4041dd6391e6cd8015546547a3c931409061172e908590613492565b60405180910390a25051519450505050505b949350505050565b61175061178d565b610577816120a3565b60606040517f9e7177c800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60005473ffffffffffffffffffffffffffffffffffffffff16331461180e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610688565b565b60005b815181101561198357600082828151811061183057611830612df2565b60200260200101519050600083838151811061184e5761184e612df2565b60200260200101516000015190508067ffffffffffffffff166000036118ac576040517fc35aa79d00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff82166004820152602401610688565b67ffffffffffffffff8181166000818152600660209081526040918290208682015181547fffffff0000000000000000000000000000000000000000ffffffffffffffffff8116690100000000000000000073ffffffffffffffffffffffffffffffffffffffff909316928302908117808555865192891691909816178152928301526801000000000000000090940460ff161515918101919091527fd5ad72bc37dc7a80a8b9b9df20500046fd7341adb1be2258a540466fdd7dcef59060600160405180910390a2505050806001019050611813565b5050565b600061072a8373ffffffffffffffffffffffffffffffffffffffff8416612198565b600061072a8373ffffffffffffffffffffffffffffffffffffffff84166121e7565b6040805173ffffffffffffffffffffffffffffffffffffffff8416602482015260448082018490528251808303909101815260649091019091526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fa9059cbb00000000000000000000000000000000000000000000000000000000179052610a019084906122e1565b60606000611a65836123ed565b9392505050565b805173ffffffffffffffffffffffffffffffffffffffff161580611aa85750604081015173ffffffffffffffffffffffffffffffffffffffff16155b15611adf576040517f35be3ac800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8051600280547fffffffffffffffffffffffff000000000000000000000000000000000000000090811673ffffffffffffffffffffffffffffffffffffffff93841617909155602080840151600380548416918516919091179055604080850151600480548516918616919091179055606080860151600580549095169086161790935580516080810182527f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff1681527f00000000000000000000000000000000000000000000000000000000000000008516928101929092527f00000000000000000000000000000000000000000000000000000000000000008416828201527f00000000000000000000000000000000000000000000000000000000000000009093169181019190915290517f23a1adf8ad7fad6091a4803227af2cee848c01a7c812404cade7c25636925e3291611c439184906135e0565b60405180910390a150565b73ffffffffffffffffffffffffffffffffffffffff81166000908152600183016020526040812054151561072a565b611caf6040518060a0016040528060608152602001606081526020016060815260200160008152602001606081525090565b8460200151600003611ced576040517f5cf0444900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000611cfd858760000151610c31565b905073ffffffffffffffffffffffffffffffffffffffff81161580611dcd57506040517f01ffc9a70000000000000000000000000000000000000000000000000000000081527faff2afbf00000000000000000000000000000000000000000000000000000000600482015273ffffffffffffffffffffffffffffffffffffffff8216906301ffc9a790602401602060405180830381865afa158015611da7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611dcb9190612b5f565b155b15611e1f5785516040517fbf16aab600000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091166004820152602401610688565b60008173ffffffffffffffffffffffffffffffffffffffff16639a4575b96040518060a001604052808881526020018967ffffffffffffffff1681526020018773ffffffffffffffffffffffffffffffffffffffff1681526020018a6020015181526020018a6000015173ffffffffffffffffffffffffffffffffffffffff168152506040518263ffffffff1660e01b8152600401611ebe919061367f565b6000604051808303816000875af1158015611edd573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0168201604052611f2391908101906136f5565b6040805160a0810190915273ffffffffffffffffffffffffffffffffffffffff841660c08201529091508060e0810160405160208183030381529060405281526020018260000151815260200182602001518152602001886020015181526020016040518060200160405280600081525081525092505050949350505050565b60008060001b82846020015185606001518660000151606001518760000151608001518860a001518960c00151604051602001611fe596959493929190613786565b604051602081830303815290604052805190602001208560400151805190602001208660e0015160405160200161201c91906137e7565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815282825280516020918201206080808c0151805190840120928501989098529183019590955260608201939093529384015260a083015260c082015260e00160405160208183030381529060405280519060200120905092915050565b3373ffffffffffffffffffffffffffffffffffffffff821603612122576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610688565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b60008181526001830160205260408120546121df5750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915561072d565b50600061072d565b600081815260018301602052604081205480156122d057600061220b6001836137fa565b855490915060009061221f906001906137fa565b905080821461228457600086600001828154811061223f5761223f612df2565b906000526020600020015490508087600001848154811061226257612262612df2565b6000918252602080832090910192909255918252600188019052604090208390555b85548690806122955761229561380d565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505061072d565b600091505061072d565b5092915050565b6000612343826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c65648152508573ffffffffffffffffffffffffffffffffffffffff166124499092919063ffffffff16565b805190915015610a0157808060200190518101906123619190612b5f565b610a01576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e60448201527f6f742073756363656564000000000000000000000000000000000000000000006064820152608401610688565b60608160000180548060200260200160405190810160405280929190818152602001828054801561243d57602002820191906000526020600020905b815481526020019060010190808311612429575b50505050509050919050565b60606117408484600085856000808673ffffffffffffffffffffffffffffffffffffffff16858760405161247d919061383c565b60006040518083038185875af1925050503d80600081146124ba576040519150601f19603f3d011682016040523d82523d6000602084013e6124bf565b606091505b50915091506124d0878383876124db565b979650505050505050565b6060831561257157825160000361256a5773ffffffffffffffffffffffffffffffffffffffff85163b61256a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610688565b5081611740565b61174083838151156125865781518083602001fd5b806040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106889190612868565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff8111828210171561260c5761260c6125ba565b60405290565b6040516080810167ffffffffffffffff8111828210171561260c5761260c6125ba565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff8111828210171561267c5761267c6125ba565b604052919050565b600067ffffffffffffffff82111561269e5761269e6125ba565b5060051b60200190565b67ffffffffffffffff8116811461057757600080fd5b73ffffffffffffffffffffffffffffffffffffffff8116811461057757600080fd5b600060208083850312156126f357600080fd5b823567ffffffffffffffff81111561270a57600080fd5b8301601f8101851361271b57600080fd5b803561272e61272982612684565b612635565b81815260069190911b8201830190838101908783111561274d57600080fd5b928401925b828410156124d0576040848903121561276b5760008081fd5b6127736125e9565b843561277e816126a8565b81528486013561278d816126be565b8187015282526040939093019290840190612752565b6080810161072d828467ffffffffffffffff8151168252602081015173ffffffffffffffffffffffffffffffffffffffff808216602085015280604084015116604085015280606084015116606085015250505050565b60005b838110156128155781810151838201526020016127fd565b50506000910152565b600081518084526128368160208601602086016127fa565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60208152600061072a602083018461281e565b600060a0828403121561288d57600080fd5b50919050565b600080604083850312156128a657600080fd5b82356128b1816126a8565b9150602083013567ffffffffffffffff8111156128cd57600080fd5b6128d98582860161287b565b9150509250929050565b600080602083850312156128f657600080fd5b823567ffffffffffffffff8082111561290e57600080fd5b818501915085601f83011261292257600080fd5b81358181111561293157600080fd5b8660208260051b850101111561294657600080fd5b60209290920196919550909350505050565b6000806040838503121561296b57600080fd5b8235612976816126a8565b91506020830135612986816126be565b809150509250929050565b6000602082840312156129a357600080fd5b8135611a65816126a8565b6080810161072d8284805173ffffffffffffffffffffffffffffffffffffffff908116835260208083015182169084015260408083015182169084015260609182015116910152565b6020808252825182820181905260009190848201906040850190845b81811015612a4557835173ffffffffffffffffffffffffffffffffffffffff1683529284019291840191600101612a13565b50909695505050505050565b8035612a5c816126be565b919050565b600060808284031215612a7357600080fd5b612a7b612612565b8235612a86816126be565b81526020830135612a96816126be565b60208201526040830135612aa9816126be565b60408201526060830135612abc816126be565b60608201529392505050565b60008060008060808587031215612ade57600080fd5b8435612ae9816126a8565b9350602085013567ffffffffffffffff811115612b0557600080fd5b612b118782880161287b565b935050604085013591506060850135612b29816126be565b939692955090935050565b600060208284031215612b4657600080fd5b8135611a65816126be565b801515811461057757600080fd5b600060208284031215612b7157600080fd5b8151611a6581612b51565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1843603018112612bb157600080fd5b830160208101925035905067ffffffffffffffff811115612bd157600080fd5b803603821315612be057600080fd5b9250929050565b8183528181602085013750600060208284010152600060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116840101905092915050565b8183526000602080850194508260005b85811015612c85578135612c53816126be565b73ffffffffffffffffffffffffffffffffffffffff168752818301358388015260409687019690910190600101612c40565b509495945050505050565b600067ffffffffffffffff808516835260406020840152612cb18485612b7c565b60a06040860152612cc660e086018284612be7565b915050612cd66020860186612b7c565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc080878503016060880152612d0c848385612be7565b9350604088013592507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1883603018312612d4557600080fd5b60209288019283019235915084821115612d5e57600080fd5b8160061b3603831315612d7057600080fd5b80878503016080880152612d85848385612c30565b9450612d9360608901612a51565b73ffffffffffffffffffffffffffffffffffffffff811660a08901529350612dbe6080890189612b7c565b94509250808786030160c088015250506124d0838383612be7565b600060208284031215612deb57600080fd5b5051919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81833603018112612e5557600080fd5b9190910192915050565b600082601f830112612e7057600080fd5b81356020612e8061272983612684565b8083825260208201915060208460051b870101935086841115612ea257600080fd5b602086015b84811015612ec7578035612eba816126be565b8352918301918301612ea7565b509695505050505050565b600060808236031215612ee457600080fd5b612eec612612565b8235612ef7816126a8565b81526020830135612f0781612b51565b6020820152604083013567ffffffffffffffff80821115612f2757600080fd5b612f3336838701612e5f565b60408401526060850135915080821115612f4c57600080fd5b50612f5936828601612e5f565b60608301525092915050565b60006020808385031215612f7857600080fd5b825167ffffffffffffffff811115612f8f57600080fd5b8301601f81018513612fa057600080fd5b8051612fae61272982612684565b81815260059190911b82018301908381019087831115612fcd57600080fd5b928401925b828410156124d0578351612fe5816126be565b82529284019290840190612fd2565b60006020828403121561300657600080fd5b8151611a65816126be565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b67ffffffffffffffff8181168382160190808211156122da576122da613011565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261309657600080fd5b83018035915067ffffffffffffffff8211156130b157600080fd5b602001915036819003821315612be057600080fd5b67ffffffffffffffff8616815273ffffffffffffffffffffffffffffffffffffffff851660208201528360408201526080606082015260006124d0608083018486612be7565b600082601f83011261311d57600080fd5b815167ffffffffffffffff811115613137576131376125ba565b61316860207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f84011601612635565b81815284602083860101111561317d57600080fd5b6117408260208301602087016127fa565b6000806000606084860312156131a357600080fd5b8351925060208401516131b581612b51565b604085015190925067ffffffffffffffff8111156131d257600080fd5b6131de8682870161310c565b9150509250925092565b600067ffffffffffffffff80831681810361320557613205613011565b6001019392505050565b60006020828403121561322157600080fd5b8151611a65816126a8565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261326157600080fd5b83018035915067ffffffffffffffff82111561327c57600080fd5b6020019150600681901b3603821315612be057600080fd5b6000604082840312156132a657600080fd5b6132ae6125e9565b82356132b9816126be565b81526020928301359281019290925250919050565b600082825180855260208086019550808260051b84010181860160005b8481101561339e577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0868403018952815160a0815181865261332f8287018261281e565b9150508582015185820387870152613347828261281e565b91505060408083015186830382880152613361838261281e565b9250505060608083015181870152506080808301519250858203818701525061338a818361281e565b9a86019a94505050908301906001016132eb565b5090979650505050505050565b67ffffffffffffffff851681526060602082015260006133ce60608301866132ce565b82810360408401526124d0818587612c30565b600060208083850312156133f457600080fd5b825167ffffffffffffffff8082111561340c57600080fd5b818501915085601f83011261342057600080fd5b815161342e61272982612684565b81815260059190911b8301840190848101908883111561344d57600080fd5b8585015b83811015613485578051858111156134695760008081fd5b6134778b89838a010161310c565b845250918601918601613451565b5098975050505050505050565b602081526134e360208201835180518252602081015167ffffffffffffffff808216602085015280604084015116604085015280606084015116606085015280608084015116608085015250505050565b6000602083015161350c60c084018273ffffffffffffffffffffffffffffffffffffffff169052565b5060408301516101808060e08501526135296101a085018361281e565b915060608501517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08086850301610100870152613566848361281e565b9350608087015191508086850301610120870152613584848361281e565b935060a087015191506135b061014087018373ffffffffffffffffffffffffffffffffffffffff169052565b60c087015161016087015260e08701519150808685030183870152506135d683826132ce565b9695505050505050565b6101008101613638828567ffffffffffffffff8151168252602081015173ffffffffffffffffffffffffffffffffffffffff808216602085015280604084015116604085015280606084015116606085015250505050565b825173ffffffffffffffffffffffffffffffffffffffff90811660808401526020840151811660a08401526040840151811660c084015260608401511660e0830152611a65565b602081526000825160a0602084015261369b60c084018261281e565b905067ffffffffffffffff6020850151166040840152604084015173ffffffffffffffffffffffffffffffffffffffff8082166060860152606086015160808601528060808701511660a086015250508091505092915050565b60006020828403121561370757600080fd5b815167ffffffffffffffff8082111561371f57600080fd5b908301906040828603121561373357600080fd5b61373b6125e9565b82518281111561374a57600080fd5b6137568782860161310c565b82525060208301518281111561376b57600080fd5b6137778782860161310c565b60208301525095945050505050565b600073ffffffffffffffffffffffffffffffffffffffff808916835260c060208401526137b660c084018961281e565b67ffffffffffffffff97881660408501529590961660608301525091909316608082015260a0019190915292915050565b60208152600061072a60208301846132ce565b8181038181111561072d5761072d613011565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b60008251612e558184602087016127fa56fea164736f6c6343000818000a",
 }
 
 var OnRampABI = OnRampMetaData.ABI
@@ -233,6 +237,59 @@ func (_OnRamp *OnRampTransactorRaw) Transact(opts *bind.TransactOpts, method str
 	return _OnRamp.Contract.contract.Transact(opts, method, params...)
 }
 
+func (_OnRamp *OnRampCaller) GetAllowedSendersList(opts *bind.CallOpts, destChainSelector uint64) ([]common.Address, error) {
+	var out []interface{}
+	err := _OnRamp.contract.Call(opts, &out, "getAllowedSendersList", destChainSelector)
+
+	if err != nil {
+		return *new([]common.Address), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new([]common.Address)).(*[]common.Address)
+
+	return out0, err
+
+}
+
+func (_OnRamp *OnRampSession) GetAllowedSendersList(destChainSelector uint64) ([]common.Address, error) {
+	return _OnRamp.Contract.GetAllowedSendersList(&_OnRamp.CallOpts, destChainSelector)
+}
+
+func (_OnRamp *OnRampCallerSession) GetAllowedSendersList(destChainSelector uint64) ([]common.Address, error) {
+	return _OnRamp.Contract.GetAllowedSendersList(&_OnRamp.CallOpts, destChainSelector)
+}
+
+func (_OnRamp *OnRampCaller) GetDestChainConfig(opts *bind.CallOpts, destChainSelector uint64) (GetDestChainConfig,
+
+	error) {
+	var out []interface{}
+	err := _OnRamp.contract.Call(opts, &out, "getDestChainConfig", destChainSelector)
+
+	outstruct := new(GetDestChainConfig)
+	if err != nil {
+		return *outstruct, err
+	}
+
+	outstruct.SequenceNumber = *abi.ConvertType(out[0], new(uint64)).(*uint64)
+	outstruct.AllowListEnabled = *abi.ConvertType(out[1], new(bool)).(*bool)
+	outstruct.Router = *abi.ConvertType(out[2], new(common.Address)).(*common.Address)
+
+	return *outstruct, err
+
+}
+
+func (_OnRamp *OnRampSession) GetDestChainConfig(destChainSelector uint64) (GetDestChainConfig,
+
+	error) {
+	return _OnRamp.Contract.GetDestChainConfig(&_OnRamp.CallOpts, destChainSelector)
+}
+
+func (_OnRamp *OnRampCallerSession) GetDestChainConfig(destChainSelector uint64) (GetDestChainConfig,
+
+	error) {
+	return _OnRamp.Contract.GetDestChainConfig(&_OnRamp.CallOpts, destChainSelector)
+}
+
 func (_OnRamp *OnRampCaller) GetDynamicConfig(opts *bind.CallOpts) (OnRampDynamicConfig, error) {
 	var out []interface{}
 	err := _OnRamp.contract.Call(opts, &out, "getDynamicConfig")
@@ -443,6 +500,18 @@ func (_OnRamp *OnRampTransactorSession) AcceptOwnership() (*types.Transaction, e
 	return _OnRamp.Contract.AcceptOwnership(&_OnRamp.TransactOpts)
 }
 
+func (_OnRamp *OnRampTransactor) ApplyAllowListUpdates(opts *bind.TransactOpts, allowListConfigArgsItems []OnRampAllowListConfigArgs) (*types.Transaction, error) {
+	return _OnRamp.contract.Transact(opts, "applyAllowListUpdates", allowListConfigArgsItems)
+}
+
+func (_OnRamp *OnRampSession) ApplyAllowListUpdates(allowListConfigArgsItems []OnRampAllowListConfigArgs) (*types.Transaction, error) {
+	return _OnRamp.Contract.ApplyAllowListUpdates(&_OnRamp.TransactOpts, allowListConfigArgsItems)
+}
+
+func (_OnRamp *OnRampTransactorSession) ApplyAllowListUpdates(allowListConfigArgsItems []OnRampAllowListConfigArgs) (*types.Transaction, error) {
+	return _OnRamp.Contract.ApplyAllowListUpdates(&_OnRamp.TransactOpts, allowListConfigArgsItems)
+}
+
 func (_OnRamp *OnRampTransactor) ApplyDestChainConfigUpdates(opts *bind.TransactOpts, destChainConfigArgs []OnRampDestChainConfigArgs) (*types.Transaction, error) {
 	return _OnRamp.contract.Transact(opts, "applyDestChainConfigUpdates", destChainConfigArgs)
 }
@@ -503,6 +572,389 @@ func (_OnRamp *OnRampTransactorSession) WithdrawFeeTokens() (*types.Transaction,
 	return _OnRamp.Contract.WithdrawFeeTokens(&_OnRamp.TransactOpts)
 }
 
+type OnRampAllowListAdminSetIterator struct {
+	Event *OnRampAllowListAdminSet
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *OnRampAllowListAdminSetIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(OnRampAllowListAdminSet)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(OnRampAllowListAdminSet)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *OnRampAllowListAdminSetIterator) Error() error {
+	return it.fail
+}
+
+func (it *OnRampAllowListAdminSetIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type OnRampAllowListAdminSet struct {
+	AllowListAdmin common.Address
+	Raw            types.Log
+}
+
+func (_OnRamp *OnRampFilterer) FilterAllowListAdminSet(opts *bind.FilterOpts, allowListAdmin []common.Address) (*OnRampAllowListAdminSetIterator, error) {
+
+	var allowListAdminRule []interface{}
+	for _, allowListAdminItem := range allowListAdmin {
+		allowListAdminRule = append(allowListAdminRule, allowListAdminItem)
+	}
+
+	logs, sub, err := _OnRamp.contract.FilterLogs(opts, "AllowListAdminSet", allowListAdminRule)
+	if err != nil {
+		return nil, err
+	}
+	return &OnRampAllowListAdminSetIterator{contract: _OnRamp.contract, event: "AllowListAdminSet", logs: logs, sub: sub}, nil
+}
+
+func (_OnRamp *OnRampFilterer) WatchAllowListAdminSet(opts *bind.WatchOpts, sink chan<- *OnRampAllowListAdminSet, allowListAdmin []common.Address) (event.Subscription, error) {
+
+	var allowListAdminRule []interface{}
+	for _, allowListAdminItem := range allowListAdmin {
+		allowListAdminRule = append(allowListAdminRule, allowListAdminItem)
+	}
+
+	logs, sub, err := _OnRamp.contract.WatchLogs(opts, "AllowListAdminSet", allowListAdminRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(OnRampAllowListAdminSet)
+				if err := _OnRamp.contract.UnpackLog(event, "AllowListAdminSet", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_OnRamp *OnRampFilterer) ParseAllowListAdminSet(log types.Log) (*OnRampAllowListAdminSet, error) {
+	event := new(OnRampAllowListAdminSet)
+	if err := _OnRamp.contract.UnpackLog(event, "AllowListAdminSet", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type OnRampAllowListSendersAddedIterator struct {
+	Event *OnRampAllowListSendersAdded
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *OnRampAllowListSendersAddedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(OnRampAllowListSendersAdded)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(OnRampAllowListSendersAdded)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *OnRampAllowListSendersAddedIterator) Error() error {
+	return it.fail
+}
+
+func (it *OnRampAllowListSendersAddedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type OnRampAllowListSendersAdded struct {
+	DestChainSelector uint64
+	Senders           []common.Address
+	Raw               types.Log
+}
+
+func (_OnRamp *OnRampFilterer) FilterAllowListSendersAdded(opts *bind.FilterOpts, destChainSelector []uint64) (*OnRampAllowListSendersAddedIterator, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+
+	logs, sub, err := _OnRamp.contract.FilterLogs(opts, "AllowListSendersAdded", destChainSelectorRule)
+	if err != nil {
+		return nil, err
+	}
+	return &OnRampAllowListSendersAddedIterator{contract: _OnRamp.contract, event: "AllowListSendersAdded", logs: logs, sub: sub}, nil
+}
+
+func (_OnRamp *OnRampFilterer) WatchAllowListSendersAdded(opts *bind.WatchOpts, sink chan<- *OnRampAllowListSendersAdded, destChainSelector []uint64) (event.Subscription, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+
+	logs, sub, err := _OnRamp.contract.WatchLogs(opts, "AllowListSendersAdded", destChainSelectorRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(OnRampAllowListSendersAdded)
+				if err := _OnRamp.contract.UnpackLog(event, "AllowListSendersAdded", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_OnRamp *OnRampFilterer) ParseAllowListSendersAdded(log types.Log) (*OnRampAllowListSendersAdded, error) {
+	event := new(OnRampAllowListSendersAdded)
+	if err := _OnRamp.contract.UnpackLog(event, "AllowListSendersAdded", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type OnRampAllowListSendersRemovedIterator struct {
+	Event *OnRampAllowListSendersRemoved
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *OnRampAllowListSendersRemovedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(OnRampAllowListSendersRemoved)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(OnRampAllowListSendersRemoved)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *OnRampAllowListSendersRemovedIterator) Error() error {
+	return it.fail
+}
+
+func (it *OnRampAllowListSendersRemovedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type OnRampAllowListSendersRemoved struct {
+	DestChainSelector uint64
+	Senders           []common.Address
+	Raw               types.Log
+}
+
+func (_OnRamp *OnRampFilterer) FilterAllowListSendersRemoved(opts *bind.FilterOpts, destChainSelector []uint64) (*OnRampAllowListSendersRemovedIterator, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+
+	logs, sub, err := _OnRamp.contract.FilterLogs(opts, "AllowListSendersRemoved", destChainSelectorRule)
+	if err != nil {
+		return nil, err
+	}
+	return &OnRampAllowListSendersRemovedIterator{contract: _OnRamp.contract, event: "AllowListSendersRemoved", logs: logs, sub: sub}, nil
+}
+
+func (_OnRamp *OnRampFilterer) WatchAllowListSendersRemoved(opts *bind.WatchOpts, sink chan<- *OnRampAllowListSendersRemoved, destChainSelector []uint64) (event.Subscription, error) {
+
+	var destChainSelectorRule []interface{}
+	for _, destChainSelectorItem := range destChainSelector {
+		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
+	}
+
+	logs, sub, err := _OnRamp.contract.WatchLogs(opts, "AllowListSendersRemoved", destChainSelectorRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(OnRampAllowListSendersRemoved)
+				if err := _OnRamp.contract.UnpackLog(event, "AllowListSendersRemoved", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_OnRamp *OnRampFilterer) ParseAllowListSendersRemoved(log types.Log) (*OnRampAllowListSendersRemoved, error) {
+	event := new(OnRampAllowListSendersRemoved)
+	if err := _OnRamp.contract.UnpackLog(event, "AllowListSendersRemoved", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
 type OnRampCCIPSendRequestedIterator struct {
 	Event *OnRampCCIPSendRequested
 
@@ -811,7 +1263,9 @@ func (it *OnRampDestChainConfigSetIterator) Close() error {
 
 type OnRampDestChainConfigSet struct {
 	DestChainSelector uint64
-	DestChainConfig   OnRampDestChainConfig
+	SequenceNumber    uint64
+	Router            common.Address
+	AllowListEnabled  bool
 	Raw               types.Log
 }
 
@@ -1414,8 +1868,20 @@ func (_OnRamp *OnRampFilterer) ParseOwnershipTransferred(log types.Log) (*OnRamp
 	return event, nil
 }
 
+type GetDestChainConfig struct {
+	SequenceNumber   uint64
+	AllowListEnabled bool
+	Router           common.Address
+}
+
 func (_OnRamp *OnRamp) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	switch log.Topics[0] {
+	case _OnRamp.abi.Events["AllowListAdminSet"].ID:
+		return _OnRamp.ParseAllowListAdminSet(log)
+	case _OnRamp.abi.Events["AllowListSendersAdded"].ID:
+		return _OnRamp.ParseAllowListSendersAdded(log)
+	case _OnRamp.abi.Events["AllowListSendersRemoved"].ID:
+		return _OnRamp.ParseAllowListSendersRemoved(log)
 	case _OnRamp.abi.Events["CCIPSendRequested"].ID:
 		return _OnRamp.ParseCCIPSendRequested(log)
 	case _OnRamp.abi.Events["ConfigSet"].ID:
@@ -1436,16 +1902,28 @@ func (_OnRamp *OnRamp) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	}
 }
 
+func (OnRampAllowListAdminSet) Topic() common.Hash {
+	return common.HexToHash("0xb8c9b44ae5b5e3afb195f67391d9ff50cb904f9c0fa5fd520e497a97c1aa5a1e")
+}
+
+func (OnRampAllowListSendersAdded) Topic() common.Hash {
+	return common.HexToHash("0x330939f6eafe8bb516716892fe962ff19770570838686e6579dbc1cc51fc3281")
+}
+
+func (OnRampAllowListSendersRemoved) Topic() common.Hash {
+	return common.HexToHash("0xc237ec1921f855ccd5e9a5af9733f2d58943a5a8501ec5988e305d7a4d421586")
+}
+
 func (OnRampCCIPSendRequested) Topic() common.Hash {
-	return common.HexToHash("0x0f07cd31e53232da9125e517f09550fdde74bf43d6a0a76ebd41674dafe2ab29")
+	return common.HexToHash("0xcae3d9f68a9ed33d0a770e9bcc6fc25d4041dd6391e6cd8015546547a3c93140")
 }
 
 func (OnRampConfigSet) Topic() common.Hash {
-	return common.HexToHash("0x2d8f19dc1cd01460c3367a09d2d424f2b1940ba7c886047edd078c7b77ea4558")
+	return common.HexToHash("0x23a1adf8ad7fad6091a4803227af2cee848c01a7c812404cade7c25636925e32")
 }
 
 func (OnRampDestChainConfigSet) Topic() common.Hash {
-	return common.HexToHash("0x324d4a7950b57da00ce533ad6697039be6281726a73da959d0ab3ff795181ec6")
+	return common.HexToHash("0xd5ad72bc37dc7a80a8b9b9df20500046fd7341adb1be2258a540466fdd7dcef5")
 }
 
 func (OnRampFeePaid) Topic() common.Hash {
@@ -1469,6 +1947,12 @@ func (_OnRamp *OnRamp) Address() common.Address {
 }
 
 type OnRampInterface interface {
+	GetAllowedSendersList(opts *bind.CallOpts, destChainSelector uint64) ([]common.Address, error)
+
+	GetDestChainConfig(opts *bind.CallOpts, destChainSelector uint64) (GetDestChainConfig,
+
+		error)
+
 	GetDynamicConfig(opts *bind.CallOpts) (OnRampDynamicConfig, error)
 
 	GetExpectedNextSequenceNumber(opts *bind.CallOpts, destChainSelector uint64) (uint64, error)
@@ -1489,6 +1973,8 @@ type OnRampInterface interface {
 
 	AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error)
 
+	ApplyAllowListUpdates(opts *bind.TransactOpts, allowListConfigArgsItems []OnRampAllowListConfigArgs) (*types.Transaction, error)
+
 	ApplyDestChainConfigUpdates(opts *bind.TransactOpts, destChainConfigArgs []OnRampDestChainConfigArgs) (*types.Transaction, error)
 
 	ForwardFromRouter(opts *bind.TransactOpts, destChainSelector uint64, message ClientEVM2AnyMessage, feeTokenAmount *big.Int, originalSender common.Address) (*types.Transaction, error)
@@ -1499,6 +1985,24 @@ type OnRampInterface interface {
 
 	WithdrawFeeTokens(opts *bind.TransactOpts) (*types.Transaction, error)
 
+	FilterAllowListAdminSet(opts *bind.FilterOpts, allowListAdmin []common.Address) (*OnRampAllowListAdminSetIterator, error)
+
+	WatchAllowListAdminSet(opts *bind.WatchOpts, sink chan<- *OnRampAllowListAdminSet, allowListAdmin []common.Address) (event.Subscription, error)
+
+	ParseAllowListAdminSet(log types.Log) (*OnRampAllowListAdminSet, error)
+
+	FilterAllowListSendersAdded(opts *bind.FilterOpts, destChainSelector []uint64) (*OnRampAllowListSendersAddedIterator, error)
+
+	WatchAllowListSendersAdded(opts *bind.WatchOpts, sink chan<- *OnRampAllowListSendersAdded, destChainSelector []uint64) (event.Subscription, error)
+
+	ParseAllowListSendersAdded(log types.Log) (*OnRampAllowListSendersAdded, error)
+
+	FilterAllowListSendersRemoved(opts *bind.FilterOpts, destChainSelector []uint64) (*OnRampAllowListSendersRemovedIterator, error)
+
+	WatchAllowListSendersRemoved(opts *bind.WatchOpts, sink chan<- *OnRampAllowListSendersRemoved, destChainSelector []uint64) (event.Subscription, error)
+
+	ParseAllowListSendersRemoved(log types.Log) (*OnRampAllowListSendersRemoved, error)
+
 	FilterCCIPSendRequested(opts *bind.FilterOpts, destChainSelector []uint64) (*OnRampCCIPSendRequestedIterator, error)
 
 	WatchCCIPSendRequested(opts *bind.WatchOpts, sink chan<- *OnRampCCIPSendRequested, destChainSelector []uint64) (event.Subscription, error)
diff --git a/core/gethwrappers/ccip/generated/ping_pong_demo/ping_pong_demo.go b/core/gethwrappers/ccip/generated/ping_pong_demo/ping_pong_demo.go
index 349d83182c..08ae9cc0cc 100644
--- a/core/gethwrappers/ccip/generated/ping_pong_demo/ping_pong_demo.go
+++ b/core/gethwrappers/ccip/generated/ping_pong_demo/ping_pong_demo.go
@@ -45,7 +45,7 @@ type ClientEVMTokenAmount struct {
 
 var PingPongDemoMetaData = &bind.MetaData{
 	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"contractIERC20\",\"name\":\"feeToken\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"router\",\"type\":\"address\"}],\"name\":\"InvalidRouter\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"isOutOfOrder\",\"type\":\"bool\"}],\"name\":\"OutOfOrderExecutionChange\",\"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\":false,\"internalType\":\"uint256\",\"name\":\"pingPongCount\",\"type\":\"uint256\"}],\"name\":\"Ping\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"pingPongCount\",\"type\":\"uint256\"}],\"name\":\"Pong\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"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\":\"destTokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structClient.Any2EVMMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"ccipReceive\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getCounterpartAddress\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getCounterpartChainSelector\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getFeeToken\",\"outputs\":[{\"internalType\":\"contractIERC20\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getOutOfOrderExecution\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getRouter\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"isPaused\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"counterpartChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"counterpartAddress\",\"type\":\"address\"}],\"name\":\"setCounterpart\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"addr\",\"type\":\"address\"}],\"name\":\"setCounterpartAddress\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"}],\"name\":\"setCounterpartChainSelector\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bool\",\"name\":\"outOfOrderExecution\",\"type\":\"bool\"}],\"name\":\"setOutOfOrderExecution\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bool\",\"name\":\"pause\",\"type\":\"bool\"}],\"name\":\"setPaused\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"startPingPong\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes4\",\"name\":\"interfaceId\",\"type\":\"bytes4\"}],\"name\":\"supportsInterface\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"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\":\"pure\",\"type\":\"function\"}]",
-	Bin: "0x60a06040523480156200001157600080fd5b506040516200159d3803806200159d833981016040819052620000349162000263565b33806000846001600160a01b03811662000069576040516335fdcccd60e21b8152600060048201526024015b60405180910390fd5b6001600160a01b039081166080528216620000c75760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f0000000000000000604482015260640162000060565b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000fa57620000fa816200019f565b50506002805460ff60a01b1916905550600380546001600160a01b0319166001600160a01b0383811691821790925560405163095ea7b360e01b8152918416600483015260001960248301529063095ea7b3906044016020604051808303816000875af115801562000170573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001969190620002a2565b505050620002cd565b336001600160a01b03821603620001f95760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000060565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b6001600160a01b03811681146200026057600080fd5b50565b600080604083850312156200027757600080fd5b825162000284816200024a565b602084015190925062000297816200024a565b809150509250929050565b600060208284031215620002b557600080fd5b81518015158114620002c657600080fd5b9392505050565b6080516112a6620002f760003960008181610295015281816106860152610ab901526112a66000f3fe608060405234801561001057600080fd5b50600436106101365760003560e01c80638da5cb5b116100b2578063b187bd2611610081578063bee518a411610066578063bee518a4146102ef578063ca709a251461032d578063f2fde38b1461034b57600080fd5b8063b187bd26146102b9578063b5a11011146102dc57600080fd5b80638da5cb5b1461023f5780639d2aede51461025d578063ae90de5514610270578063b0f479a11461029357600080fd5b80632874d8bf11610109578063665ed537116100ee578063665ed5371461021157806379ba50971461022457806385572ffb1461022c57600080fd5b80632874d8bf146101ca5780632b6e5d63146101d257600080fd5b806301ffc9a71461013b57806316c38b3c14610163578063181f5a77146101785780631892b906146101b7575b600080fd5b61014e610149366004610cba565b61035e565b60405190151581526020015b60405180910390f35b610176610171366004610d03565b6103f7565b005b604080518082018252601281527f50696e67506f6e6744656d6f20312e322e3000000000000000000000000000006020820152905161015a9190610d89565b6101766101c5366004610db9565b610449565b6101766104a4565b60025473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161015a565b61017661021f366004610d03565b6104e0565b61017661056c565b61017661023a366004610dd4565b61066e565b60005473ffffffffffffffffffffffffffffffffffffffff166101ec565b61017661026b366004610e33565b6106f3565b60035474010000000000000000000000000000000000000000900460ff1661014e565b7f00000000000000000000000000000000000000000000000000000000000000006101ec565b60025474010000000000000000000000000000000000000000900460ff1661014e565b6101766102ea366004610e4e565b610742565b60015474010000000000000000000000000000000000000000900467ffffffffffffffff1660405167ffffffffffffffff909116815260200161015a565b60035473ffffffffffffffffffffffffffffffffffffffff166101ec565b610176610359366004610e33565b6107e4565b60007fffffffff0000000000000000000000000000000000000000000000000000000082167f85572ffb0000000000000000000000000000000000000000000000000000000014806103f157507fffffffff0000000000000000000000000000000000000000000000000000000082167f01ffc9a700000000000000000000000000000000000000000000000000000000145b92915050565b6103ff6107f5565b6002805491151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff909216919091179055565b6104516107f5565b6001805467ffffffffffffffff90921674010000000000000000000000000000000000000000027fffffffff0000000000000000ffffffffffffffffffffffffffffffffffffffff909216919091179055565b6104ac6107f5565b600280547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556104de6001610876565b565b6104e86107f5565b6003805482151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff9091161790556040517f05a3fef9935c9013a24c6193df2240d34fcf6b0ebf8786b85efe8401d696cdd99061056190831515815260200190565b60405180910390a150565b60015473ffffffffffffffffffffffffffffffffffffffff1633146105f2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b3373ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016146106df576040517fd7f733340000000000000000000000000000000000000000000000000000000081523360048201526024016105e9565b6106f06106eb82611084565b610b6f565b50565b6106fb6107f5565b600280547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff92909216919091179055565b61074a6107f5565b6001805467ffffffffffffffff90931674010000000000000000000000000000000000000000027fffffffff0000000000000000ffffffffffffffffffffffffffffffffffffffff909316929092179091556002805473ffffffffffffffffffffffffffffffffffffffff9092167fffffffffffffffffffffffff0000000000000000000000000000000000000000909216919091179055565b6107ec6107f5565b6106f081610bc5565b60005473ffffffffffffffffffffffffffffffffffffffff1633146104de576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016105e9565b806001166001036108b9576040518181527f48257dc961b6f792c2b78a080dacfed693b660960a702de21cee364e20270e2f9060200160405180910390a16108ed565b6040518181527f58b69f57828e6962d216502094c54f6562f3bf082ba758966c3454f9e37b15259060200160405180910390a15b6040805160a0810190915260025473ffffffffffffffffffffffffffffffffffffffff1660c08201526000908060e0810160405160208183030381529060405281526020018360405160200161094591815260200190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052815260200160006040519080825280602002602001820160405280156109bf57816020015b60408051808201909152600080825260208201528152602001906001900390816109985790505b50815260035473ffffffffffffffffffffffffffffffffffffffff811660208084019190915260408051808201825262030d408082527401000000000000000000000000000000000000000090940460ff16151590830190815281516024810194909452511515604480850191909152815180850390910181526064909301815290820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f181dcf1000000000000000000000000000000000000000000000000000000000179052909101526001546040517f96f4e9f90000000000000000000000000000000000000000000000000000000081529192507f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16916396f4e9f991610b27917401000000000000000000000000000000000000000090910467ffffffffffffffff16908590600401611131565b6020604051808303816000875af1158015610b46573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b6a9190611246565b505050565b60008160600151806020019051810190610b899190611246565b60025490915074010000000000000000000000000000000000000000900460ff16610bc157610bc1610bbc82600161125f565b610876565b5050565b3373ffffffffffffffffffffffffffffffffffffffff821603610c44576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016105e9565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b600060208284031215610ccc57600080fd5b81357fffffffff0000000000000000000000000000000000000000000000000000000081168114610cfc57600080fd5b9392505050565b600060208284031215610d1557600080fd5b81358015158114610cfc57600080fd5b6000815180845260005b81811015610d4b57602081850181015186830182015201610d2f565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b602081526000610cfc6020830184610d25565b803567ffffffffffffffff81168114610db457600080fd5b919050565b600060208284031215610dcb57600080fd5b610cfc82610d9c565b600060208284031215610de657600080fd5b813567ffffffffffffffff811115610dfd57600080fd5b820160a08185031215610cfc57600080fd5b803573ffffffffffffffffffffffffffffffffffffffff81168114610db457600080fd5b600060208284031215610e4557600080fd5b610cfc82610e0f565b60008060408385031215610e6157600080fd5b610e6a83610d9c565b9150610e7860208401610e0f565b90509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715610ed357610ed3610e81565b60405290565b60405160a0810167ffffffffffffffff81118282101715610ed357610ed3610e81565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715610f4357610f43610e81565b604052919050565b600082601f830112610f5c57600080fd5b813567ffffffffffffffff811115610f7657610f76610e81565b610fa760207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f84011601610efc565b818152846020838601011115610fbc57600080fd5b816020850160208301376000918101602001919091529392505050565b600082601f830112610fea57600080fd5b8135602067ffffffffffffffff82111561100657611006610e81565b611014818360051b01610efc565b82815260069290921b8401810191818101908684111561103357600080fd5b8286015b8481101561107957604081890312156110505760008081fd5b611058610eb0565b61106182610e0f565b81528185013585820152835291830191604001611037565b509695505050505050565b600060a0823603121561109657600080fd5b61109e610ed9565b823581526110ae60208401610d9c565b6020820152604083013567ffffffffffffffff808211156110ce57600080fd5b6110da36838701610f4b565b604084015260608501359150808211156110f357600080fd5b6110ff36838701610f4b565b6060840152608085013591508082111561111857600080fd5b5061112536828601610fd9565b60808301525092915050565b6000604067ffffffffffffffff851683526020604081850152845160a0604086015261116060e0860182610d25565b9050818601517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc08087840301606088015261119b8383610d25565b6040890151888203830160808a01528051808352908601945060009350908501905b808410156111fc578451805173ffffffffffffffffffffffffffffffffffffffff168352860151868301529385019360019390930192908601906111bd565b50606089015173ffffffffffffffffffffffffffffffffffffffff1660a08901526080890151888203830160c08a015295506112388187610d25565b9a9950505050505050505050565b60006020828403121561125857600080fd5b5051919050565b808201808211156103f1577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fdfea164736f6c6343000818000a",
+	Bin: "0x60a06040523480156200001157600080fd5b506040516200159d3803806200159d833981016040819052620000349162000263565b33806000846001600160a01b03811662000069576040516335fdcccd60e21b8152600060048201526024015b60405180910390fd5b6001600160a01b039081166080528216620000c75760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f0000000000000000604482015260640162000060565b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000fa57620000fa816200019f565b50506002805460ff60a01b1916905550600380546001600160a01b0319166001600160a01b0383811691821790925560405163095ea7b360e01b8152918416600483015260001960248301529063095ea7b3906044016020604051808303816000875af115801562000170573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001969190620002a2565b505050620002cd565b336001600160a01b03821603620001f95760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000060565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b6001600160a01b03811681146200026057600080fd5b50565b600080604083850312156200027757600080fd5b825162000284816200024a565b602084015190925062000297816200024a565b809150509250929050565b600060208284031215620002b557600080fd5b81518015158114620002c657600080fd5b9392505050565b6080516112a6620002f760003960008181610295015281816106860152610ab901526112a66000f3fe608060405234801561001057600080fd5b50600436106101365760003560e01c80638da5cb5b116100b2578063b187bd2611610081578063bee518a411610066578063bee518a4146102ef578063ca709a251461032d578063f2fde38b1461034b57600080fd5b8063b187bd26146102b9578063b5a11011146102dc57600080fd5b80638da5cb5b1461023f5780639d2aede51461025d578063ae90de5514610270578063b0f479a11461029357600080fd5b80632874d8bf11610109578063665ed537116100ee578063665ed5371461021157806379ba50971461022457806385572ffb1461022c57600080fd5b80632874d8bf146101ca5780632b6e5d63146101d257600080fd5b806301ffc9a71461013b57806316c38b3c14610163578063181f5a77146101785780631892b906146101b7575b600080fd5b61014e610149366004610cba565b61035e565b60405190151581526020015b60405180910390f35b610176610171366004610d03565b6103f7565b005b604080518082018252601281527f50696e67506f6e6744656d6f20312e352e3000000000000000000000000000006020820152905161015a9190610d89565b6101766101c5366004610db9565b610449565b6101766104a4565b60025473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161015a565b61017661021f366004610d03565b6104e0565b61017661056c565b61017661023a366004610dd4565b61066e565b60005473ffffffffffffffffffffffffffffffffffffffff166101ec565b61017661026b366004610e33565b6106f3565b60035474010000000000000000000000000000000000000000900460ff1661014e565b7f00000000000000000000000000000000000000000000000000000000000000006101ec565b60025474010000000000000000000000000000000000000000900460ff1661014e565b6101766102ea366004610e4e565b610742565b60015474010000000000000000000000000000000000000000900467ffffffffffffffff1660405167ffffffffffffffff909116815260200161015a565b60035473ffffffffffffffffffffffffffffffffffffffff166101ec565b610176610359366004610e33565b6107e4565b60007fffffffff0000000000000000000000000000000000000000000000000000000082167f85572ffb0000000000000000000000000000000000000000000000000000000014806103f157507fffffffff0000000000000000000000000000000000000000000000000000000082167f01ffc9a700000000000000000000000000000000000000000000000000000000145b92915050565b6103ff6107f5565b6002805491151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff909216919091179055565b6104516107f5565b6001805467ffffffffffffffff90921674010000000000000000000000000000000000000000027fffffffff0000000000000000ffffffffffffffffffffffffffffffffffffffff909216919091179055565b6104ac6107f5565b600280547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556104de6001610876565b565b6104e86107f5565b6003805482151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff9091161790556040517f05a3fef9935c9013a24c6193df2240d34fcf6b0ebf8786b85efe8401d696cdd99061056190831515815260200190565b60405180910390a150565b60015473ffffffffffffffffffffffffffffffffffffffff1633146105f2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b3373ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016146106df576040517fd7f733340000000000000000000000000000000000000000000000000000000081523360048201526024016105e9565b6106f06106eb82611084565b610b6f565b50565b6106fb6107f5565b600280547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff92909216919091179055565b61074a6107f5565b6001805467ffffffffffffffff90931674010000000000000000000000000000000000000000027fffffffff0000000000000000ffffffffffffffffffffffffffffffffffffffff909316929092179091556002805473ffffffffffffffffffffffffffffffffffffffff9092167fffffffffffffffffffffffff0000000000000000000000000000000000000000909216919091179055565b6107ec6107f5565b6106f081610bc5565b60005473ffffffffffffffffffffffffffffffffffffffff1633146104de576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016105e9565b806001166001036108b9576040518181527f48257dc961b6f792c2b78a080dacfed693b660960a702de21cee364e20270e2f9060200160405180910390a16108ed565b6040518181527f58b69f57828e6962d216502094c54f6562f3bf082ba758966c3454f9e37b15259060200160405180910390a15b6040805160a0810190915260025473ffffffffffffffffffffffffffffffffffffffff1660c08201526000908060e0810160405160208183030381529060405281526020018360405160200161094591815260200190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052815260200160006040519080825280602002602001820160405280156109bf57816020015b60408051808201909152600080825260208201528152602001906001900390816109985790505b50815260035473ffffffffffffffffffffffffffffffffffffffff811660208084019190915260408051808201825262030d408082527401000000000000000000000000000000000000000090940460ff16151590830190815281516024810194909452511515604480850191909152815180850390910181526064909301815290820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f181dcf1000000000000000000000000000000000000000000000000000000000179052909101526001546040517f96f4e9f90000000000000000000000000000000000000000000000000000000081529192507f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16916396f4e9f991610b27917401000000000000000000000000000000000000000090910467ffffffffffffffff16908590600401611131565b6020604051808303816000875af1158015610b46573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b6a9190611246565b505050565b60008160600151806020019051810190610b899190611246565b60025490915074010000000000000000000000000000000000000000900460ff16610bc157610bc1610bbc82600161125f565b610876565b5050565b3373ffffffffffffffffffffffffffffffffffffffff821603610c44576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016105e9565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b600060208284031215610ccc57600080fd5b81357fffffffff0000000000000000000000000000000000000000000000000000000081168114610cfc57600080fd5b9392505050565b600060208284031215610d1557600080fd5b81358015158114610cfc57600080fd5b6000815180845260005b81811015610d4b57602081850181015186830182015201610d2f565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b602081526000610cfc6020830184610d25565b803567ffffffffffffffff81168114610db457600080fd5b919050565b600060208284031215610dcb57600080fd5b610cfc82610d9c565b600060208284031215610de657600080fd5b813567ffffffffffffffff811115610dfd57600080fd5b820160a08185031215610cfc57600080fd5b803573ffffffffffffffffffffffffffffffffffffffff81168114610db457600080fd5b600060208284031215610e4557600080fd5b610cfc82610e0f565b60008060408385031215610e6157600080fd5b610e6a83610d9c565b9150610e7860208401610e0f565b90509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715610ed357610ed3610e81565b60405290565b60405160a0810167ffffffffffffffff81118282101715610ed357610ed3610e81565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715610f4357610f43610e81565b604052919050565b600082601f830112610f5c57600080fd5b813567ffffffffffffffff811115610f7657610f76610e81565b610fa760207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f84011601610efc565b818152846020838601011115610fbc57600080fd5b816020850160208301376000918101602001919091529392505050565b600082601f830112610fea57600080fd5b8135602067ffffffffffffffff82111561100657611006610e81565b611014818360051b01610efc565b82815260069290921b8401810191818101908684111561103357600080fd5b8286015b8481101561107957604081890312156110505760008081fd5b611058610eb0565b61106182610e0f565b81528185013585820152835291830191604001611037565b509695505050505050565b600060a0823603121561109657600080fd5b61109e610ed9565b823581526110ae60208401610d9c565b6020820152604083013567ffffffffffffffff808211156110ce57600080fd5b6110da36838701610f4b565b604084015260608501359150808211156110f357600080fd5b6110ff36838701610f4b565b6060840152608085013591508082111561111857600080fd5b5061112536828601610fd9565b60808301525092915050565b6000604067ffffffffffffffff851683526020604081850152845160a0604086015261116060e0860182610d25565b9050818601517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc08087840301606088015261119b8383610d25565b6040890151888203830160808a01528051808352908601945060009350908501905b808410156111fc578451805173ffffffffffffffffffffffffffffffffffffffff168352860151868301529385019360019390930192908601906111bd565b50606089015173ffffffffffffffffffffffffffffffffffffffff1660a08901526080890151888203830160c08a015295506112388187610d25565b9a9950505050505050505050565b60006020828403121561125857600080fd5b5051919050565b808201808211156103f1577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fdfea164736f6c6343000818000a",
 }
 
 var PingPongDemoABI = PingPongDemoMetaData.ABI
diff --git a/core/gethwrappers/ccip/generated/price_registry/price_registry.go b/core/gethwrappers/ccip/generated/price_registry/price_registry.go
deleted file mode 100644
index fd50287f53..0000000000
--- a/core/gethwrappers/ccip/generated/price_registry/price_registry.go
+++ /dev/null
@@ -1,3039 +0,0 @@
-// Code generated - DO NOT EDIT.
-// This file is a generated binding and any manual changes will be lost.
-
-package price_registry
-
-import (
-	"errors"
-	"fmt"
-	"math/big"
-	"strings"
-
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
-)
-
-var (
-	_ = errors.New
-	_ = big.NewInt
-	_ = strings.NewReader
-	_ = ethereum.NotFound
-	_ = bind.Bind
-	_ = common.Big1
-	_ = types.BloomLookup
-	_ = event.NewSubscription
-	_ = abi.ConvertType
-)
-
-type AuthorizedCallersAuthorizedCallerArgs struct {
-	AddedCallers   []common.Address
-	RemovedCallers []common.Address
-}
-
-type ClientEVM2AnyMessage struct {
-	Receiver     []byte
-	Data         []byte
-	TokenAmounts []ClientEVMTokenAmount
-	FeeToken     common.Address
-	ExtraArgs    []byte
-}
-
-type ClientEVMTokenAmount struct {
-	Token  common.Address
-	Amount *big.Int
-}
-
-type IPriceRegistryTokenPriceFeedConfig struct {
-	DataFeedAddress common.Address
-	TokenDecimals   uint8
-}
-
-type InternalGasPriceUpdate struct {
-	DestChainSelector uint64
-	UsdPerUnitGas     *big.Int
-}
-
-type InternalPriceUpdates struct {
-	TokenPriceUpdates []InternalTokenPriceUpdate
-	GasPriceUpdates   []InternalGasPriceUpdate
-}
-
-type InternalRampTokenAmount struct {
-	SourcePoolAddress []byte
-	DestTokenAddress  []byte
-	ExtraData         []byte
-	Amount            *big.Int
-}
-
-type InternalTimestampedPackedUint224 struct {
-	Value     *big.Int
-	Timestamp uint32
-}
-
-type InternalTokenPriceUpdate struct {
-	SourceToken common.Address
-	UsdPerToken *big.Int
-}
-
-type KeystoneFeedsPermissionHandlerPermission struct {
-	Forwarder     common.Address
-	WorkflowName  [10]byte
-	ReportName    [2]byte
-	WorkflowOwner common.Address
-	IsAllowed     bool
-}
-
-type PriceRegistryDestChainConfig struct {
-	IsEnabled                         bool
-	MaxNumberOfTokensPerMsg           uint16
-	MaxDataBytes                      uint32
-	MaxPerMsgGasLimit                 uint32
-	DestGasOverhead                   uint32
-	DestGasPerPayloadByte             uint16
-	DestDataAvailabilityOverheadGas   uint32
-	DestGasPerDataAvailabilityByte    uint16
-	DestDataAvailabilityMultiplierBps uint16
-	DefaultTokenFeeUSDCents           uint16
-	DefaultTokenDestGasOverhead       uint32
-	DefaultTokenDestBytesOverhead     uint32
-	DefaultTxGasLimit                 uint32
-	GasMultiplierWeiPerEth            uint64
-	NetworkFeeUSDCents                uint32
-	EnforceOutOfOrder                 bool
-	ChainFamilySelector               [4]byte
-}
-
-type PriceRegistryDestChainConfigArgs struct {
-	DestChainSelector uint64
-	DestChainConfig   PriceRegistryDestChainConfig
-}
-
-type PriceRegistryPremiumMultiplierWeiPerEthArgs struct {
-	Token                      common.Address
-	PremiumMultiplierWeiPerEth uint64
-}
-
-type PriceRegistryStaticConfig struct {
-	MaxFeeJuelsPerMsg  *big.Int
-	LinkToken          common.Address
-	StalenessThreshold uint32
-}
-
-type PriceRegistryTokenPriceFeedUpdate struct {
-	SourceToken common.Address
-	FeedConfig  IPriceRegistryTokenPriceFeedConfig
-}
-
-type PriceRegistryTokenTransferFeeConfig struct {
-	MinFeeUSDCents    uint32
-	MaxFeeUSDCents    uint32
-	DeciBps           uint16
-	DestGasOverhead   uint32
-	DestBytesOverhead uint32
-	IsEnabled         bool
-}
-
-type PriceRegistryTokenTransferFeeConfigArgs struct {
-	DestChainSelector       uint64
-	TokenTransferFeeConfigs []PriceRegistryTokenTransferFeeConfigSingleTokenArgs
-}
-
-type PriceRegistryTokenTransferFeeConfigRemoveArgs struct {
-	DestChainSelector uint64
-	Token             common.Address
-}
-
-type PriceRegistryTokenTransferFeeConfigSingleTokenArgs struct {
-	Token                  common.Address
-	TokenTransferFeeConfig PriceRegistryTokenTransferFeeConfig
-}
-
-var PriceRegistryMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"components\":[{\"internalType\":\"uint96\",\"name\":\"maxFeeJuelsPerMsg\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"linkToken\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"stalenessThreshold\",\"type\":\"uint32\"}],\"internalType\":\"structPriceRegistry.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\":\"structIPriceRegistry.TokenPriceFeedConfig\",\"name\":\"feedConfig\",\"type\":\"tuple\"}],\"internalType\":\"structPriceRegistry.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\":\"structPriceRegistry.TokenTransferFeeConfig\",\"name\":\"tokenTransferFeeConfig\",\"type\":\"tuple\"}],\"internalType\":\"structPriceRegistry.TokenTransferFeeConfigSingleTokenArgs[]\",\"name\":\"tokenTransferFeeConfigs\",\"type\":\"tuple[]\"}],\"internalType\":\"structPriceRegistry.TokenTransferFeeConfigArgs[]\",\"name\":\"tokenTransferFeeConfigArgs\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"premiumMultiplierWeiPerEth\",\"type\":\"uint64\"}],\"internalType\":\"structPriceRegistry.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\":\"defaultTokenDestBytesOverhead\",\"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\":\"structPriceRegistry.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"internalType\":\"structPriceRegistry.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\"},{\"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\":\"defaultTokenDestBytesOverhead\",\"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\":\"structPriceRegistry.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\":\"defaultTokenDestBytesOverhead\",\"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\":\"structPriceRegistry.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\":\"structIPriceRegistry.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\":\"structPriceRegistry.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\":\"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\":\"defaultTokenDestBytesOverhead\",\"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\":\"structPriceRegistry.DestChainConfig\",\"name\":\"destChainConfig\",\"type\":\"tuple\"}],\"internalType\":\"structPriceRegistry.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\":\"structPriceRegistry.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\":\"structPriceRegistry.TokenTransferFeeConfig\",\"name\":\"tokenTransferFeeConfig\",\"type\":\"tuple\"}],\"internalType\":\"structPriceRegistry.TokenTransferFeeConfigSingleTokenArgs[]\",\"name\":\"tokenTransferFeeConfigs\",\"type\":\"tuple[]\"}],\"internalType\":\"structPriceRegistry.TokenTransferFeeConfigArgs[]\",\"name\":\"tokenTransferFeeConfigArgs\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"internalType\":\"structPriceRegistry.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\":\"defaultTokenDestBytesOverhead\",\"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\":\"structPriceRegistry.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\":\"structPriceRegistry.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\":\"structIPriceRegistry.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\":\"structPriceRegistry.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\"}],\"name\":\"processMessageArgs\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"msgFeeJuels\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"isOutOfOrderExecution\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"convertedExtraArgs\",\"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\":\"structIPriceRegistry.TokenPriceFeedConfig\",\"name\":\"feedConfig\",\"type\":\"tuple\"}],\"internalType\":\"structPriceRegistry.TokenPriceFeedUpdate[]\",\"name\":\"tokenPriceFeedUpdates\",\"type\":\"tuple[]\"}],\"name\":\"updateTokenPriceFeeds\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.RampTokenAmount[]\",\"name\":\"rampTokenAmounts\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structClient.EVMTokenAmount[]\",\"name\":\"sourceTokenAmounts\",\"type\":\"tuple[]\"}],\"name\":\"validatePoolReturnData\",\"outputs\":[],\"stateMutability\":\"view\",\"type\":\"function\"}]",
-	Bin: "0x60e06040523480156200001157600080fd5b50604051620075cf380380620075cf83398101604081905262000034916200188e565b8533806000816200008c5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000bf57620000bf8162000207565b5050604080518082018252838152815160008152602080820190935291810191909152620000ee9150620002b2565b5060208701516001600160a01b0316158062000112575086516001600160601b0316155b80620001265750604087015163ffffffff16155b15620001455760405163d794ef9560e01b815260040160405180910390fd5b6020878101516001600160a01b031660a05287516001600160601b031660805260408089015163ffffffff1660c05280516000815291820190526200018c90869062000401565b620001978462000549565b620001a2816200061a565b620001ad8262000a9f565b60408051600080825260208201909252620001fa91859190620001f3565b6040805180820190915260008082526020820152815260200190600190039081620001cb5790505b5062000b6b565b5050505050505062001b4c565b336001600160a01b03821603620002615760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000083565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b602081015160005b815181101562000342576000828281518110620002db57620002db620019ad565b60209081029190910101519050620002f560028262000ea4565b1562000338576040516001600160a01b03821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101620002ba565b50815160005b8151811015620003fb576000828281518110620003695762000369620019ad565b6020026020010151905060006001600160a01b0316816001600160a01b031603620003a7576040516342bcdf7f60e11b815260040160405180910390fd5b620003b460028262000ec4565b506040516001600160a01b03821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a15060010162000348565b50505050565b60005b8251811015620004a25762000440838281518110620004275762000427620019ad565b6020026020010151600b62000ec460201b90919060201c565b1562000499578281815181106200045b576200045b620019ad565b60200260200101516001600160a01b03167fdf1b1bd32a69711488d71554706bb130b1fc63a5fa1a2cd85e8440f84065ba2360405160405180910390a25b60010162000404565b5060005b81518110156200054457620004e2828281518110620004c957620004c9620019ad565b6020026020010151600b62000edb60201b90919060201c565b156200053b57818181518110620004fd57620004fd620019ad565b60200260200101516001600160a01b03167f1795838dc8ab2ffc5f431a1729a6afa0b587f982f7b2be0b9d7187a1ef547f9160405160405180910390a25b600101620004a6565b505050565b60005b8151811015620006165760008282815181106200056d576200056d620019ad565b6020908102919091018101518051818301516001600160a01b0380831660008181526007875260409081902084518154868a018051929096166001600160a81b03199091168117600160a01b60ff9384160217909255825191825293519093169683019690965293955091939092917f08a5f7f5bb38a81d8e43aca13ecd76431dbf8816ae4699affff7b00b2fc1c464910160405180910390a25050508060010190506200054c565b5050565b60005b8151811015620006165760008282815181106200063e576200063e620019ad565b6020026020010151905060008383815181106200065f576200065f620019ad565b6020026020010151600001519050600082602001519050816001600160401b03166000148062000698575061018081015163ffffffff16155b80620006ba57506102008101516001600160e01b031916630a04b54b60e21b14155b80620006d75750602063ffffffff1681610160015163ffffffff16105b80620006f75750806060015163ffffffff1681610180015163ffffffff16115b15620007225760405163c35aa79d60e01b81526001600160401b038316600482015260240162000083565b6001600160401b038216600090815260096020526040812060010154600160a81b900460e01b6001600160e01b0319169003620007a257816001600160401b03167fa937382a486d993de71c220bc8b559242deb4e286a353fa732330b4aa7d1357782604051620007949190620019c3565b60405180910390a2620007e6565b816001600160401b03167fa7b607fc10d28a1caf39ab7d27f4c94945db708a576d572781a455c5894fad9382604051620007dd9190620019c3565b60405180910390a25b8060096000846001600160401b03166001600160401b0316815260200190815260200160002060008201518160000160006101000a81548160ff02191690831515021790555060208201518160000160016101000a81548161ffff021916908361ffff16021790555060408201518160000160036101000a81548163ffffffff021916908363ffffffff16021790555060608201518160000160076101000a81548163ffffffff021916908363ffffffff160217905550608082015181600001600b6101000a81548163ffffffff021916908363ffffffff16021790555060a082015181600001600f6101000a81548161ffff021916908361ffff16021790555060c08201518160000160116101000a81548163ffffffff021916908363ffffffff16021790555060e08201518160000160156101000a81548161ffff021916908361ffff1602179055506101008201518160000160176101000a81548161ffff021916908361ffff1602179055506101208201518160000160196101000a81548161ffff021916908361ffff16021790555061014082015181600001601b6101000a81548163ffffffff021916908363ffffffff1602179055506101608201518160010160006101000a81548163ffffffff021916908363ffffffff1602179055506101808201518160010160046101000a81548163ffffffff021916908363ffffffff1602179055506101a08201518160010160086101000a8154816001600160401b0302191690836001600160401b031602179055506101c08201518160010160106101000a81548163ffffffff021916908363ffffffff1602179055506101e08201518160010160146101000a81548160ff0219169083151502179055506102008201518160010160156101000a81548163ffffffff021916908360e01c02179055509050505050508060010190506200061d565b60005b81518110156200061657600082828151811062000ac35762000ac3620019ad565b6020026020010151600001519050600083838151811062000ae85762000ae8620019ad565b6020908102919091018101518101516001600160a01b03841660008181526008845260409081902080546001600160401b0319166001600160401b0385169081179091559051908152919350917fbb77da6f7210cdd16904228a9360133d1d7dfff99b1bc75f128da5b53e28f97d910160405180910390a2505060010162000aa2565b60005b825181101562000dde57600083828151811062000b8f5762000b8f620019ad565b6020026020010151905060008160000151905060005b82602001515181101562000dcf5760008360200151828151811062000bce5762000bce620019ad565b602002602001015160200151905060008460200151838151811062000bf75762000bf7620019ad565b6020026020010151600001519050602063ffffffff16826080015163ffffffff16101562000c565760808201516040516312766e0160e11b81526001600160a01b038316600482015263ffffffff909116602482015260440162000083565b6001600160401b0384166000818152600a602090815260408083206001600160a01b0386168085529083529281902086518154938801518389015160608a015160808b015160a08c01511515600160901b0260ff60901b1963ffffffff928316600160701b021664ffffffffff60701b199383166a01000000000000000000000263ffffffff60501b1961ffff90961668010000000000000000029590951665ffffffffffff60401b19968416640100000000026001600160401b0319909b16939097169290921798909817939093169390931717919091161792909217909155519091907f94967ae9ea7729ad4f54021c1981765d2b1d954f7c92fbec340aa0a54f46b8b59062000dbc908690600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60405180910390a3505060010162000ba5565b50505080600101905062000b6e565b5060005b81518110156200054457600082828151811062000e035762000e03620019ad565b6020026020010151600001519050600083838151811062000e285762000e28620019ad565b6020908102919091018101518101516001600160401b0384166000818152600a845260408082206001600160a01b038516808452955280822080546001600160981b03191690555192945090917f4de5b1bcbca6018c11303a2c3f4a4b4f22a1c741d8c4ba430d246ac06c5ddf8b9190a3505060010162000de2565b600062000ebb836001600160a01b03841662000ef2565b90505b92915050565b600062000ebb836001600160a01b03841662000ff6565b600062000ebb836001600160a01b03841662001048565b6000818152600183016020526040812054801562000feb57600062000f1960018362001b14565b855490915060009062000f2f9060019062001b14565b905081811462000f9b57600086600001828154811062000f535762000f53620019ad565b906000526020600020015490508087600001848154811062000f795762000f79620019ad565b6000918252602080832090910192909255918252600188019052604090208390555b855486908062000faf5762000faf62001b36565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505062000ebe565b600091505062000ebe565b60008181526001830160205260408120546200103f5750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915562000ebe565b50600062000ebe565b6000818152600183016020526040812054801562000feb5760006200106f60018362001b14565b8554909150600090620010859060019062001b14565b905080821462000f9b57600086600001828154811062000f535762000f53620019ad565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b0381118282101715620010e457620010e4620010a9565b60405290565b60405160c081016001600160401b0381118282101715620010e457620010e4620010a9565b60405161022081016001600160401b0381118282101715620010e457620010e4620010a9565b604051601f8201601f191681016001600160401b0381118282101715620011605762001160620010a9565b604052919050565b80516001600160a01b03811681146200118057600080fd5b919050565b805163ffffffff811681146200118057600080fd5b600060608284031215620011ad57600080fd5b604051606081016001600160401b0381118282101715620011d257620011d2620010a9565b604052825190915081906001600160601b0381168114620011f257600080fd5b8152620012026020840162001168565b6020820152620012156040840162001185565b60408201525092915050565b60006001600160401b038211156200123d576200123d620010a9565b5060051b60200190565b600082601f8301126200125957600080fd5b81516020620012726200126c8362001221565b62001135565b8083825260208201915060208460051b8701019350868411156200129557600080fd5b602086015b84811015620012bc57620012ae8162001168565b83529183019183016200129a565b509695505050505050565b600082601f830112620012d957600080fd5b81516020620012ec6200126c8362001221565b828152606092830285018201928282019190878511156200130c57600080fd5b8387015b858110156200139f57808903828112156200132b5760008081fd5b62001335620010bf565b620013408362001168565b8152604080601f1984011215620013575760008081fd5b62001361620010bf565b92506200137088850162001168565b835283015160ff81168114620013865760008081fd5b8288015280870191909152845292840192810162001310565b5090979650505050505050565b80516001600160401b03811681146200118057600080fd5b805161ffff811681146200118057600080fd5b805180151581146200118057600080fd5b600082601f830112620013fa57600080fd5b815160206200140d6200126c8362001221565b82815260059290921b840181019181810190868411156200142d57600080fd5b8286015b84811015620012bc5780516001600160401b03808211156200145257600080fd5b908801906040601f19838c0381018213156200146d57600080fd5b62001477620010bf565b62001484898601620013ac565b815282850151848111156200149857600080fd5b8086019550508c603f860112620014ae57600080fd5b888501519350620014c36200126c8562001221565b84815260e09094028501830193898101908e861115620014e257600080fd5b958401955b85871015620015bb57868f0360e08112156200150257600080fd5b6200150c620010bf565b620015178962001168565b815260c086830112156200152a57600080fd5b62001534620010ea565b9150620015438d8a0162001185565b825262001552878a0162001185565b8d8301526200156460608a01620013c4565b878301526200157660808a0162001185565b60608301526200158960a08a0162001185565b60808301526200159c60c08a01620013d7565b60a0830152808d0191909152825260e09690960195908a0190620014e7565b828b01525087525050509284019250830162001431565b600082601f830112620015e457600080fd5b81516020620015f76200126c8362001221565b82815260069290921b840181019181810190868411156200161757600080fd5b8286015b84811015620012bc5760408189031215620016365760008081fd5b62001640620010bf565b6200164b8262001168565b81526200165a858301620013ac565b818601528352918301916040016200161b565b80516001600160e01b0319811681146200118057600080fd5b600082601f8301126200169857600080fd5b81516020620016ab6200126c8362001221565b8281526102409283028501820192828201919087851115620016cc57600080fd5b8387015b858110156200139f5780890382811215620016eb5760008081fd5b620016f5620010bf565b6200170083620013ac565b815261022080601f1984011215620017185760008081fd5b620017226200110f565b925062001731888501620013d7565b8352604062001742818601620013c4565b8985015260606200175581870162001185565b82860152608091506200176a82870162001185565b9085015260a06200177d86820162001185565b8286015260c0915062001792828701620013c4565b9085015260e0620017a586820162001185565b828601526101009150620017bb828701620013c4565b90850152610120620017cf868201620013c4565b828601526101409150620017e5828701620013c4565b90850152610160620017f986820162001185565b8286015261018091506200180f82870162001185565b908501526101a06200182386820162001185565b828601526101c0915062001839828701620013ac565b908501526101e06200184d86820162001185565b82860152610200915062001863828701620013d7565b90850152620018748583016200166d565b9084015250808701919091528452928401928101620016d0565b6000806000806000806000610120888a031215620018ab57600080fd5b620018b789896200119a565b60608901519097506001600160401b0380821115620018d557600080fd5b620018e38b838c0162001247565b975060808a0151915080821115620018fa57600080fd5b620019088b838c0162001247565b965060a08a01519150808211156200191f57600080fd5b6200192d8b838c01620012c7565b955060c08a01519150808211156200194457600080fd5b620019528b838c01620013e8565b945060e08a01519150808211156200196957600080fd5b620019778b838c01620015d2565b93506101008a01519150808211156200198f57600080fd5b506200199e8a828b0162001686565b91505092959891949750929550565b634e487b7160e01b600052603260045260246000fd5b81511515815261022081016020830151620019e4602084018261ffff169052565b506040830151620019fd604084018263ffffffff169052565b50606083015162001a16606084018263ffffffff169052565b50608083015162001a2f608084018263ffffffff169052565b5060a083015162001a4660a084018261ffff169052565b5060c083015162001a5f60c084018263ffffffff169052565b5060e083015162001a7660e084018261ffff169052565b506101008381015161ffff9081169184019190915261012080850151909116908301526101408084015163ffffffff9081169184019190915261016080850151821690840152610180808501518216908401526101a0808501516001600160401b0316908401526101c080850151909116908301526101e080840151151590830152610200928301516001600160e01b031916929091019190915290565b8181038181111562000ebe57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603160045260246000fd5b60805160a05160c051615a2962001ba6600039600081816102ef01528181612035015261209e0152600081816102b3015281816115b0015261161001526000818161027f0152818161163901526116a90152615a296000f3fe608060405234801561001057600080fd5b50600436106101ce5760003560e01c80637afac32211610104578063c4276bfc116100a2578063d8694ccd11610071578063d8694ccd14610a98578063f2fde38b14610aab578063f700042a14610abe578063ffdb4b3714610ad157600080fd5b8063c4276bfc14610a48578063cc88924c14610a6a578063cdc73d5114610a7d578063d02641a014610a8557600080fd5b80638da5cb5b116100de5780638da5cb5b1461094d57806391a2749a14610975578063a69c64c014610988578063bf78e03f1461099b57600080fd5b80637afac322146107b7578063805f2132146107ca57806382b49eb0146107dd57600080fd5b806341ed29e711610171578063514e8cff1161014b578063514e8cff146104615780636def4ce714610504578063770e2dc41461079c57806379ba5097146107af57600080fd5b806341ed29e7146103ee57806345ac924d146104015780634ab35b0b1461042157600080fd5b8063181f5a77116101ad578063181f5a77146103685780632451a627146103b15780633937306f146103c6578063407e1086146103db57600080fd5b806241e5be146101d3578063061877e3146101f957806306285c6914610252575b600080fd5b6101e66101e1366004614142565b610b19565b6040519081526020015b60405180910390f35b61023961020736600461417e565b73ffffffffffffffffffffffffffffffffffffffff1660009081526008602052604090205467ffffffffffffffff1690565b60405167ffffffffffffffff90911681526020016101f0565b61031c604080516060810182526000808252602082018190529181019190915260405180606001604052807f00000000000000000000000000000000000000000000000000000000000000006bffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1681526020017f000000000000000000000000000000000000000000000000000000000000000063ffffffff16815250905090565b6040805182516bffffffffffffffffffffffff16815260208084015173ffffffffffffffffffffffffffffffffffffffff16908201529181015163ffffffff16908201526060016101f0565b6103a46040518060400160405280601781526020017f5072696365526567697374727920312e362e302d64657600000000000000000081525081565b6040516101f091906141fd565b6103b9610b87565b6040516101f09190614210565b6103d96103d436600461426a565b610b98565b005b6103d96103e936600461440c565b610e4d565b6103d96103fc36600461453e565b610e61565b61041461040f3660046146be565b610ea3565b6040516101f09190614700565b61043461042f36600461417e565b610f6e565b6040517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff90911681526020016101f0565b6104f761046f366004614793565b60408051808201909152600080825260208201525067ffffffffffffffff166000908152600560209081526040918290208251808401909352547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811683527c0100000000000000000000000000000000000000000000000000000000900463ffffffff169082015290565b6040516101f091906147ae565b61078f610512366004614793565b6040805161022081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e08101829052610100810182905261012081018290526101408101829052610160810182905261018081018290526101a081018290526101c081018290526101e081018290526102008101919091525067ffffffffffffffff908116600090815260096020908152604091829020825161022081018452815460ff8082161515835261ffff61010080840482169685019690965263ffffffff630100000084048116978501979097526701000000000000008304871660608501526b0100000000000000000000008304871660808501526f010000000000000000000000000000008304811660a0850152710100000000000000000000000000000000008304871660c08501527501000000000000000000000000000000000000000000808404821660e08087019190915277010000000000000000000000000000000000000000000000850483169786019790975279010000000000000000000000000000000000000000000000000084049091166101208501527b010000000000000000000000000000000000000000000000000000009092048616610140840152600190930154808616610160840152640100000000810486166101808401526801000000000000000081049096166101a083015270010000000000000000000000000000000086049094166101c082015274010000000000000000000000000000000000000000850490911615156101e08201527fffffffff0000000000000000000000000000000000000000000000000000000092909304901b1661020082015290565b6040516101f091906147e9565b6103d96107aa366004614a0d565b610f79565b6103d9610f8b565b6103d96107c5366004614d27565b61108d565b6103d96107d8366004614dcd565b61109f565b6108ed6107eb366004614e39565b6040805160c081018252600080825260208201819052918101829052606081018290526080810182905260a08101919091525067ffffffffffffffff919091166000908152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff94909416835292815290829020825160c081018452905463ffffffff8082168352640100000000820481169383019390935268010000000000000000810461ffff16938201939093526a01000000000000000000008304821660608201526e01000000000000000000000000000083049091166080820152720100000000000000000000000000000000000090910460ff16151560a082015290565b6040516101f09190600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60005460405173ffffffffffffffffffffffffffffffffffffffff90911681526020016101f0565b6103d9610983366004614e63565b611587565b6103d9610996366004614ef4565b611598565b610a146109a936600461417e565b6040805180820182526000808252602091820181905273ffffffffffffffffffffffffffffffffffffffff93841681526007825282902082518084019093525492831682527401000000000000000000000000000000000000000090920460ff169181019190915290565b60408051825173ffffffffffffffffffffffffffffffffffffffff16815260209283015160ff1692810192909252016101f0565b610a5b610a56366004614fb9565b6115a9565b6040516101f093929190615028565b6103d9610a78366004615049565b6117a7565b6103b961197d565b6104f7610a9336600461417e565b611989565b6101e6610aa63660046150f7565b611a85565b6103d9610ab936600461417e565b611f3f565b6103d9610acc36600461517c565b611f50565b610ae4610adf36600461539c565b611f61565b604080517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff9384168152929091166020830152016101f0565b6000610b24826120ec565b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16610b4b856120ec565b610b73907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16856153f5565b610b7d919061540c565b90505b9392505050565b6060610b936002612186565b905090565b610ba0612193565b6000610bac8280615447565b9050905060005b81811015610cf6576000610bc78480615447565b83818110610bd757610bd76154af565b905060400201803603810190610bed919061550a565b604080518082018252602080840180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff908116845263ffffffff42818116858701908152885173ffffffffffffffffffffffffffffffffffffffff9081166000908152600690975295889020965190519092167c010000000000000000000000000000000000000000000000000000000002919092161790935584519051935194955016927f52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a92610ce59290917bffffffffffffffffffffffffffffffffffffffffffffffffffffffff929092168252602082015260400190565b60405180910390a250600101610bb3565b506000610d066020840184615447565b9050905060005b81811015610e47576000610d246020860186615447565b83818110610d3457610d346154af565b905060400201803603810190610d4a9190615547565b604080518082018252602080840180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff908116845263ffffffff42818116858701908152885167ffffffffffffffff9081166000908152600590975295889020965190519092167c010000000000000000000000000000000000000000000000000000000002919092161790935584519051935194955016927fdd84a3fa9ef9409f550d54d6affec7e9c480c878c6ab27b78912a03e1b371c6e92610e369290917bffffffffffffffffffffffffffffffffffffffffffffffffffffffff929092168252602082015260400190565b60405180910390a250600101610d0d565b50505050565b610e556121d8565b610e5e81612259565b50565b610e696121d8565b60005b8151811015610e9f57610e97828281518110610e8a57610e8a6154af565b6020026020010151612357565b600101610e6c565b5050565b60608160008167ffffffffffffffff811115610ec157610ec16142a5565b604051908082528060200260200182016040528015610f0657816020015b6040805180820190915260008082526020820152815260200190600190039081610edf5790505b50905060005b82811015610f6357610f3e868683818110610f2957610f296154af565b9050602002016020810190610a93919061417e565b828281518110610f5057610f506154af565b6020908102919091010152600101610f0c565b509150505b92915050565b6000610f68826120ec565b610f816121d8565b610e9f8282612529565b60015473ffffffffffffffffffffffffffffffffffffffff163314611011576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b6110956121d8565b610e9f828261293b565b60008060006110e387878080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250612a8292505050565b9250925092506110f533838584612a9d565b60006111038587018761556a565b905060005b815181101561157c57600060076000848481518110611129576111296154af565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff16825281019190915260400160009081205474010000000000000000000000000000000000000000900460ff1691508190036111ea57828281518110611193576111936154af565b6020908102919091010151516040517f06439c6b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091166004820152602401611008565b6000611233601283868681518110611204576112046154af565b6020026020010151602001517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16612bf5565b90506006600085858151811061124b5761124b6154af565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001601c9054906101000a900463ffffffff1663ffffffff168484815181106112bd576112bd6154af565b60200260200101516040015163ffffffff1610156113c7578383815181106112e7576112e76154af565b602002602001015160000151848481518110611305576113056154af565b60200260200101516040015160066000878781518110611327576113276154af565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff90811683529082019290925260409081016000205490517f191ec70600000000000000000000000000000000000000000000000000000000815293909116600484015263ffffffff91821660248401527c01000000000000000000000000000000000000000000000000000000009004166044820152606401611008565b6040518060400160405280827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff168152602001858581518110611408576114086154af565b60200260200101516040015163ffffffff1681525060066000868681518110611433576114336154af565b6020908102919091018101515173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040016000208251929091015163ffffffff167c0100000000000000000000000000000000000000000000000000000000027bffffffffffffffffffffffffffffffffffffffffffffffffffffffff90921691909117905583518490849081106114cb576114cb6154af565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff167f52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a82868681518110611521576115216154af565b60200260200101516040015160405161156a9291907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff92909216825263ffffffff16602082015260400190565b60405180910390a25050600101611108565b505050505050505050565b61158f6121d8565b610e5e81612cbb565b6115a06121d8565b610e5e81612e47565b60008060607f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168773ffffffffffffffffffffffffffffffffffffffff160361160957859250611637565b61163487877f0000000000000000000000000000000000000000000000000000000000000000610b19565b92505b7f00000000000000000000000000000000000000000000000000000000000000006bffffffffffffffffffffffff168311156116d6576040517f6a92a483000000000000000000000000000000000000000000000000000000008152600481018490526bffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000166024820152604401611008565b67ffffffffffffffff8816600090815260096020526040812060010154640100000000900463ffffffff169061170d878784612f31565b9050806020015193508484611794836040805182516024820152602092830151151560448083019190915282518083039091018152606490910190915290810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f181dcf100000000000000000000000000000000000000000000000000000000017905290565b9450945094505050955095509592505050565b67ffffffffffffffff85166000908152600960205260408120600101547501000000000000000000000000000000000000000000900460e01b905b848110156119745760008484838181106117fe576117fe6154af565b611814926020604090920201908101915061417e565b9050600087878481811061182a5761182a6154af565b905060200281019061183c9190615631565b61184a90604081019061566f565b91505060208111156118fa5767ffffffffffffffff89166000908152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff861684529091529020546e010000000000000000000000000000900463ffffffff168111156118fa576040517f36f536ca00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff83166004820152602401611008565b61196a84898986818110611910576119106154af565b90506020028101906119229190615631565b61193090602081019061566f565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506130da92505050565b50506001016117e2565b50505050505050565b6060610b93600b612186565b604080518082019091526000808252602082015273ffffffffffffffffffffffffffffffffffffffff8281166000908152600760209081526040918290208251808401909352549283168083527401000000000000000000000000000000000000000090930460ff169082015290611a7c57505073ffffffffffffffffffffffffffffffffffffffff166000908152600660209081526040918290208251808401909352547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811683527c0100000000000000000000000000000000000000000000000000000000900463ffffffff169082015290565b610b808161312c565b67ffffffffffffffff8083166000908152600960209081526040808320815161022081018352815460ff808216151580845261ffff61010080850482169886019890985263ffffffff630100000085048116978601979097526701000000000000008404871660608601526b0100000000000000000000008404871660808601526f010000000000000000000000000000008404811660a0860152710100000000000000000000000000000000008404871660c08601527501000000000000000000000000000000000000000000808504821660e08088019190915277010000000000000000000000000000000000000000000000860483169987019990995279010000000000000000000000000000000000000000000000000085049091166101208601527b010000000000000000000000000000000000000000000000000000009093048616610140850152600190940154808616610160850152640100000000810486166101808501526801000000000000000081049098166101a084015270010000000000000000000000000000000088049094166101c083015274010000000000000000000000000000000000000000870490931615156101e08201527fffffffff000000000000000000000000000000000000000000000000000000009290950490921b16610200840152909190611cbb576040517f99ac52f200000000000000000000000000000000000000000000000000000000815267ffffffffffffffff85166004820152602401611008565b6000611cca6040850185615447565b9150611d26905082611cdf602087018761566f565b905083611cec888061566f565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506132bb92505050565b6000600881611d3b608088016060890161417e565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160009081205467ffffffffffffffff16915080611d8a611d846080890160608a0161417e565b89611f61565b9092509050600080808615611dd057611dc4888c611dae60808e0160608f0161417e565b888e8060400190611dbf9190615447565b613365565b91945092509050611df0565b6101c0880151611ded9063ffffffff16662386f26fc100006153f5565b92505b61010088015160009061ffff1615611e3457611e31896dffffffffffffffffffffffffffff607088901c16611e2860208f018f61566f565b90508b86613643565b90505b6101a089015160009067ffffffffffffffff16611e5d611e5760808f018f61566f565b8d6136f3565b600001518563ffffffff168c60a0015161ffff168f8060200190611e81919061566f565b611e8c9291506153f5565b8d6080015163ffffffff16611ea191906156d4565b611eab91906156d4565b611eb591906156d4565b611ecf906dffffffffffffffffffffffffffff89166153f5565b611ed991906153f5565b90507bffffffffffffffffffffffffffffffffffffffffffffffffffffffff87168282611f1067ffffffffffffffff8c16896153f5565b611f1a91906156d4565b611f2491906156d4565b611f2e919061540c565b9d9c50505050505050505050505050565b611f476121d8565b610e5e816137b4565b611f586121d8565b610e5e816138a9565b67ffffffffffffffff811660009081526005602090815260408083208151808301909252547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811682527c0100000000000000000000000000000000000000000000000000000000900463ffffffff1691810182905282918203612019576040517f2e59db3a00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff85166004820152602401611008565b6000816020015163ffffffff164261203191906156e7565b90507f000000000000000000000000000000000000000000000000000000000000000063ffffffff168111156120d2576040517ff08bcb3e00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8616600482015263ffffffff7f000000000000000000000000000000000000000000000000000000000000000016602482015260448101829052606401611008565b6120db866120ec565b9151919350909150505b9250929050565b6000806120f883611989565b9050806020015163ffffffff1660001480612130575080517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16155b1561217f576040517f06439c6b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff84166004820152602401611008565b5192915050565b60606000610b8083613d97565b61219e600233613df3565b6121d6576040517fd86ad9cf000000000000000000000000000000000000000000000000000000008152336004820152602401611008565b565b60005473ffffffffffffffffffffffffffffffffffffffff1633146121d6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401611008565b60005b8151811015610e9f576000828281518110612279576122796154af565b60209081029190910181015180518183015173ffffffffffffffffffffffffffffffffffffffff80831660008181526007875260409081902084518154868a018051929096167fffffffffffffffffffffff00000000000000000000000000000000000000000090911681177401000000000000000000000000000000000000000060ff9384160217909255825191825293519093169683019690965293955091939092917f08a5f7f5bb38a81d8e43aca13ecd76431dbf8816ae4699affff7b00b2fc1c464910160405180910390a250505080600101905061225c565b600061241082600001518360600151846020015185604001516040805173ffffffffffffffffffffffffffffffffffffffff80871660208301528516918101919091527fffffffffffffffffffff00000000000000000000000000000000000000000000831660608201527fffff0000000000000000000000000000000000000000000000000000000000008216608082015260009060a001604051602081830303815290604052805190602001209050949350505050565b60808301516000828152600460205260409081902080549215157fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00909316929092179091555190915081907f32a4ba3fa3351b11ad555d4c8ec70a744e8705607077a946807030d64b6ab1a39061251d908590600060a08201905073ffffffffffffffffffffffffffffffffffffffff8084511683527fffffffffffffffffffff0000000000000000000000000000000000000000000060208501511660208401527fffff00000000000000000000000000000000000000000000000000000000000060408501511660408401528060608501511660608401525060808301511515608083015292915050565b60405180910390a25050565b60005b8251811015612852576000838281518110612549576125496154af565b6020026020010151905060008160000151905060005b82602001515181101561284457600083602001518281518110612584576125846154af565b60200260200101516020015190506000846020015183815181106125aa576125aa6154af565b6020026020010151600001519050602063ffffffff16826080015163ffffffff16101561262d5760808201516040517f24ecdc0200000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8316600482015263ffffffff9091166024820152604401611008565b67ffffffffffffffff84166000818152600a6020908152604080832073ffffffffffffffffffffffffffffffffffffffff86168085529083529281902086518154938801518389015160608a015160808b015160a08c015115157201000000000000000000000000000000000000027fffffffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffff63ffffffff9283166e01000000000000000000000000000002167fffffffffffffffffffffffffff0000000000ffffffffffffffffffffffffffff9383166a0100000000000000000000027fffffffffffffffffffffffffffffffffffff00000000ffffffffffffffffffff61ffff9096166801000000000000000002959095167fffffffffffffffffffffffffffffffffffff000000000000ffffffffffffffff968416640100000000027fffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000909b16939097169290921798909817939093169390931717919091161792909217909155519091907f94967ae9ea7729ad4f54021c1981765d2b1d954f7c92fbec340aa0a54f46b8b590612832908690600060c08201905063ffffffff80845116835280602085015116602084015261ffff60408501511660408401528060608501511660608401528060808501511660808401525060a0830151151560a083015292915050565b60405180910390a3505060010161255f565b50505080600101905061252c565b5060005b8151811015612936576000828281518110612873576128736154af565b60200260200101516000015190506000838381518110612895576128956154af565b60209081029190910181015181015167ffffffffffffffff84166000818152600a8452604080822073ffffffffffffffffffffffffffffffffffffffff8516808452955280822080547fffffffffffffffffffffffffff000000000000000000000000000000000000001690555192945090917f4de5b1bcbca6018c11303a2c3f4a4b4f22a1c741d8c4ba430d246ac06c5ddf8b9190a35050600101612856565b505050565b60005b82518110156129de5761297483828151811061295c5761295c6154af565b6020026020010151600b613e2290919063ffffffff16565b156129d65782818151811061298b5761298b6154af565b602002602001015173ffffffffffffffffffffffffffffffffffffffff167fdf1b1bd32a69711488d71554706bb130b1fc63a5fa1a2cd85e8440f84065ba2360405160405180910390a25b60010161293e565b5060005b815181101561293657612a18828281518110612a0057612a006154af565b6020026020010151600b613e4490919063ffffffff16565b15612a7a57818181518110612a2f57612a2f6154af565b602002602001015173ffffffffffffffffffffffffffffffffffffffff167f1795838dc8ab2ffc5f431a1729a6afa0b587f982f7b2be0b9d7187a1ef547f9160405160405180910390a25b6001016129e2565b6040810151604a820151605e90920151909260609290921c91565b6040805173ffffffffffffffffffffffffffffffffffffffff868116602080840191909152908616828401527fffffffffffffffffffff00000000000000000000000000000000000000000000851660608301527fffff00000000000000000000000000000000000000000000000000000000000084166080808401919091528351808403909101815260a09092018352815191810191909120600081815260049092529190205460ff16612bee576040517f097e17ff00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8087166004830152851660248201527fffffffffffffffffffff00000000000000000000000000000000000000000000841660448201527fffff00000000000000000000000000000000000000000000000000000000000083166064820152608401611008565b5050505050565b600080612c0284866156fa565b9050600060248260ff161115612c3957612c1d602483615713565b612c2890600a61584c565b612c32908561540c565b9050612c5c565b612c44826024615713565b612c4f90600a61584c565b612c5990856153f5565b90505b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811115612cb2576040517f10cb51d100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b95945050505050565b602081015160005b8151811015612d56576000828281518110612ce057612ce06154af565b60200260200101519050612cfe816002613e6690919063ffffffff16565b15612d4d5760405173ffffffffffffffffffffffffffffffffffffffff821681527fc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda775809060200160405180910390a15b50600101612cc3565b50815160005b8151811015610e47576000828281518110612d7957612d796154af565b60200260200101519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603612de9576040517f8579befe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b612df4600282613e22565b5060405173ffffffffffffffffffffffffffffffffffffffff821681527feb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef9060200160405180910390a150600101612d5c565b60005b8151811015610e9f576000828281518110612e6757612e676154af565b60200260200101516000015190506000838381518110612e8957612e896154af565b60209081029190910181015181015173ffffffffffffffffffffffffffffffffffffffff841660008181526008845260409081902080547fffffffffffffffffffffffffffffffffffffffffffffffff00000000000000001667ffffffffffffffff85169081179091559051908152919350917fbb77da6f7210cdd16904228a9360133d1d7dfff99b1bc75f128da5b53e28f97d910160405180910390a25050600101612e4a565b60408051808201909152600080825260208201526000839003612f7257506040805180820190915267ffffffffffffffff8216815260006020820152610b80565b6000612f7e848661585b565b90506000612f8f85600481896158a1565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509293505050507fffffffff0000000000000000000000000000000000000000000000000000000082167fe7e230f0000000000000000000000000000000000000000000000000000000000161302c578080602001905181019061302391906158cb565b92505050610b80565b7f6859a837000000000000000000000000000000000000000000000000000000007fffffffff000000000000000000000000000000000000000000000000000000008316016130a85760405180604001604052808280602001905181019061309491906158f7565b815260006020909101529250610b80915050565b6040517f5247fdce00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b7fd7ed2ad4000000000000000000000000000000000000000000000000000000007fffffffff00000000000000000000000000000000000000000000000000000000831601610e9f5761293681613e88565b604080518082019091526000808252602082015260008260000151905060008173ffffffffffffffffffffffffffffffffffffffff1663feaf968c6040518163ffffffff1660e01b815260040160a060405180830381865afa158015613196573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906131ba919061592a565b50505091505060008112156131fb576040517f10cb51d100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061327a8373ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa15801561324b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061326f919061597a565b866020015184612bf5565b604080518082019091527bffffffffffffffffffffffffffffffffffffffffffffffffffffffff909116815263ffffffff4216602082015295945050505050565b836040015163ffffffff168311156133145760408085015190517f8693378900000000000000000000000000000000000000000000000000000000815263ffffffff909116600482015260248101849052604401611008565b836020015161ffff16821115613356576040517f4c056b6a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610e47846102000151826130da565b6000808083815b81811015613635576000878783818110613388576133886154af565b90506040020180360381019061339e9190615997565b67ffffffffffffffff8c166000908152600a60209081526040808320845173ffffffffffffffffffffffffffffffffffffffff168452825291829020825160c081018452905463ffffffff8082168352640100000000820481169383019390935268010000000000000000810461ffff16938201939093526a01000000000000000000008304821660608201526e01000000000000000000000000000083049091166080820152720100000000000000000000000000000000000090910460ff16151560a08201819052919250906134c4576101208d015161348b9061ffff16662386f26fc100006153f5565b61349590886156d4565b96508c6101400151866134a891906159d0565b95508c6101600151856134bb91906159d0565b9450505061362d565b604081015160009061ffff161561357d5760008c73ffffffffffffffffffffffffffffffffffffffff16846000015173ffffffffffffffffffffffffffffffffffffffff1614613520578351613519906120ec565b9050613523565b508a5b620186a0836040015161ffff166135658660200151847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16613f3b90919063ffffffff16565b61356f91906153f5565b613579919061540c565b9150505b606082015161358c90886159d0565b965081608001518661359e91906159d0565b82519096506000906135bd9063ffffffff16662386f26fc100006153f5565b9050808210156135dc576135d1818a6156d4565b98505050505061362d565b6000836020015163ffffffff16662386f26fc100006135fb91906153f5565b90508083111561361b5761360f818b6156d4565b9950505050505061362d565b613625838b6156d4565b995050505050505b60010161336c565b505096509650969350505050565b60008063ffffffff8316613659610140866153f5565b613665876101c06156d4565b61366f91906156d4565b61367991906156d4565b905060008760c0015163ffffffff168860e0015161ffff168361369c91906153f5565b6136a691906156d4565b61010089015190915061ffff166136cd6dffffffffffffffffffffffffffff8916836153f5565b6136d791906153f5565b6136e790655af3107a40006153f5565b98975050505050505050565b6040805180820190915260008082526020820152600061371f858585610180015163ffffffff16612f31565b9050826060015163ffffffff1681600001511115613769576040517f4c4fc93a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b826101e00151801561377d57508060200151155b15610b7d576040517fee433e9900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff821603613833576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401611008565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b60005b8151811015610e9f5760008282815181106138c9576138c96154af565b6020026020010151905060008383815181106138e7576138e76154af565b60200260200101516000015190506000826020015190508167ffffffffffffffff1660001480613920575061018081015163ffffffff16155b8061397257506102008101517fffffffff00000000000000000000000000000000000000000000000000000000167f2812d52c0000000000000000000000000000000000000000000000000000000014155b8061398e5750602063ffffffff1681610160015163ffffffff16105b806139ad5750806060015163ffffffff1681610180015163ffffffff16115b156139f0576040517fc35aa79d00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff83166004820152602401611008565b67ffffffffffffffff82166000908152600960205260408120600101547501000000000000000000000000000000000000000000900460e01b7fffffffff00000000000000000000000000000000000000000000000000000000169003613a98578167ffffffffffffffff167fa937382a486d993de71c220bc8b559242deb4e286a353fa732330b4aa7d1357782604051613a8b91906147e9565b60405180910390a2613adb565b8167ffffffffffffffff167fa7b607fc10d28a1caf39ab7d27f4c94945db708a576d572781a455c5894fad9382604051613ad291906147e9565b60405180910390a25b80600960008467ffffffffffffffff1667ffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548160ff02191690831515021790555060208201518160000160016101000a81548161ffff021916908361ffff16021790555060408201518160000160036101000a81548163ffffffff021916908363ffffffff16021790555060608201518160000160076101000a81548163ffffffff021916908363ffffffff160217905550608082015181600001600b6101000a81548163ffffffff021916908363ffffffff16021790555060a082015181600001600f6101000a81548161ffff021916908361ffff16021790555060c08201518160000160116101000a81548163ffffffff021916908363ffffffff16021790555060e08201518160000160156101000a81548161ffff021916908361ffff1602179055506101008201518160000160176101000a81548161ffff021916908361ffff1602179055506101208201518160000160196101000a81548161ffff021916908361ffff16021790555061014082015181600001601b6101000a81548163ffffffff021916908363ffffffff1602179055506101608201518160010160006101000a81548163ffffffff021916908363ffffffff1602179055506101808201518160010160046101000a81548163ffffffff021916908363ffffffff1602179055506101a08201518160010160086101000a81548167ffffffffffffffff021916908367ffffffffffffffff1602179055506101c08201518160010160106101000a81548163ffffffff021916908363ffffffff1602179055506101e08201518160010160146101000a81548160ff0219169083151502179055506102008201518160010160156101000a81548163ffffffff021916908360e01c02179055509050505050508060010190506138ac565b606081600001805480602002602001604051908101604052809291908181526020018280548015613de757602002820191906000526020600020905b815481526020019060010190808311613dd3575b50505050509050919050565b73ffffffffffffffffffffffffffffffffffffffff811660009081526001830160205260408120541515610b80565b6000610b808373ffffffffffffffffffffffffffffffffffffffff8416613f78565b6000610b808373ffffffffffffffffffffffffffffffffffffffff8416613fc7565b6000610b808373ffffffffffffffffffffffffffffffffffffffff84166140c1565b60008151602014613ec757816040517f8d666f6000000000000000000000000000000000000000000000000000000000815260040161100891906141fd565b600082806020019051810190613edd91906158f7565b905073ffffffffffffffffffffffffffffffffffffffff811180613f02575061040081105b15610f6857826040517f8d666f6000000000000000000000000000000000000000000000000000000000815260040161100891906141fd565b6000670de0b6b3a7640000613f6e837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff86166153f5565b610b80919061540c565b6000818152600183016020526040812054613fbf57508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155610f68565b506000610f68565b600081815260018301602052604081205480156140b0576000613feb6001836156e7565b8554909150600090613fff906001906156e7565b905080821461406457600086600001828154811061401f5761401f6154af565b9060005260206000200154905080876000018481548110614042576140426154af565b6000918252602080832090910192909255918252600188019052604090208390555b8554869080614075576140756159ed565b600190038181906000526020600020016000905590558560010160008681526020019081526020016000206000905560019350505050610f68565b6000915050610f68565b5092915050565b600081815260018301602052604081205480156140b05760006140e56001836156e7565b85549091506000906140f9906001906156e7565b905081811461406457600086600001828154811061401f5761401f6154af565b803573ffffffffffffffffffffffffffffffffffffffff8116811461413d57600080fd5b919050565b60008060006060848603121561415757600080fd5b61416084614119565b92506020840135915061417560408501614119565b90509250925092565b60006020828403121561419057600080fd5b610b8082614119565b6000815180845260005b818110156141bf576020818501810151868301820152016141a3565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b602081526000610b806020830184614199565b6020808252825182820181905260009190848201906040850190845b8181101561425e57835173ffffffffffffffffffffffffffffffffffffffff168352928401929184019160010161422c565b50909695505050505050565b60006020828403121561427c57600080fd5b813567ffffffffffffffff81111561429357600080fd5b820160408185031215610b8057600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff811182821017156142f7576142f76142a5565b60405290565b60405160a0810167ffffffffffffffff811182821017156142f7576142f76142a5565b60405160c0810167ffffffffffffffff811182821017156142f7576142f76142a5565b604051610220810167ffffffffffffffff811182821017156142f7576142f76142a5565b6040516060810167ffffffffffffffff811182821017156142f7576142f76142a5565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156143d1576143d16142a5565b604052919050565b600067ffffffffffffffff8211156143f3576143f36142a5565b5060051b60200190565b60ff81168114610e5e57600080fd5b6000602080838503121561441f57600080fd5b823567ffffffffffffffff81111561443657600080fd5b8301601f8101851361444757600080fd5b803561445a614455826143d9565b61438a565b8181526060918202830184019184820191908884111561447957600080fd5b938501935b8385101561451957848903818112156144975760008081fd5b61449f6142d4565b6144a887614119565b81526040807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0840112156144dc5760008081fd5b6144e46142d4565b92506144f1898901614119565b83528701356144ff816143fd565b82890152808801919091528352938401939185019161447e565b50979650505050505050565b8015158114610e5e57600080fd5b803561413d81614525565b6000602080838503121561455157600080fd5b823567ffffffffffffffff81111561456857600080fd5b8301601f8101851361457957600080fd5b8035614587614455826143d9565b81815260a091820283018401918482019190888411156145a657600080fd5b938501935b838510156145195780858a0312156145c35760008081fd5b6145cb6142fd565b6145d486614119565b8152868601357fffffffffffffffffffff00000000000000000000000000000000000000000000811681146146095760008081fd5b818801526040868101357fffff000000000000000000000000000000000000000000000000000000000000811681146146425760008081fd5b908201526060614653878201614119565b9082015260808681013561466681614525565b90820152835293840193918501916145ab565b60008083601f84011261468b57600080fd5b50813567ffffffffffffffff8111156146a357600080fd5b6020830191508360208260051b85010111156120e557600080fd5b600080602083850312156146d157600080fd5b823567ffffffffffffffff8111156146e857600080fd5b6146f485828601614679565b90969095509350505050565b602080825282518282018190526000919060409081850190868401855b8281101561476e5761475e84835180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16825260209081015163ffffffff16910152565b928401929085019060010161471d565b5091979650505050505050565b803567ffffffffffffffff8116811461413d57600080fd5b6000602082840312156147a557600080fd5b610b808261477b565b81517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16815260208083015163ffffffff169082015260408101610f68565b81511515815261022081016020830151614809602084018261ffff169052565b506040830151614821604084018263ffffffff169052565b506060830151614839606084018263ffffffff169052565b506080830151614851608084018263ffffffff169052565b5060a083015161486760a084018261ffff169052565b5060c083015161487f60c084018263ffffffff169052565b5060e083015161489560e084018261ffff169052565b506101008381015161ffff9081169184019190915261012080850151909116908301526101408084015163ffffffff9081169184019190915261016080850151821690840152610180808501518216908401526101a08085015167ffffffffffffffff16908401526101c080850151909116908301526101e080840151151590830152610200808401517fffffffff000000000000000000000000000000000000000000000000000000008116828501525b505092915050565b803563ffffffff8116811461413d57600080fd5b803561ffff8116811461413d57600080fd5b600082601f83011261498657600080fd5b81356020614996614455836143d9565b82815260069290921b840181019181810190868411156149b557600080fd5b8286015b84811015614a0257604081890312156149d25760008081fd5b6149da6142d4565b6149e38261477b565b81526149f0858301614119565b818601528352918301916040016149b9565b509695505050505050565b60008060408385031215614a2057600080fd5b67ffffffffffffffff83351115614a3657600080fd5b83601f843585010112614a4857600080fd5b614a5861445584358501356143d9565b8335840180358083526020808401939260059290921b90910101861015614a7e57600080fd5b602085358601015b85358601803560051b01602001811015614c8b5767ffffffffffffffff81351115614ab057600080fd5b8035863587010160407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0828a03011215614ae957600080fd5b614af16142d4565b614afd6020830161477b565b815267ffffffffffffffff60408301351115614b1857600080fd5b88603f604084013584010112614b2d57600080fd5b614b4361445560206040850135850101356143d9565b6020604084810135850182810135808552928401939260e00201018b1015614b6a57600080fd5b6040808501358501015b6040858101358601602081013560e0020101811015614c6c5760e0818d031215614b9d57600080fd5b614ba56142d4565b614bae82614119565b815260c07fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0838f03011215614be257600080fd5b614bea614320565b614bf66020840161494f565b8152614c046040840161494f565b6020820152614c1560608401614963565b6040820152614c266080840161494f565b6060820152614c3760a0840161494f565b6080820152614c4960c0840135614525565b60c083013560a0820152602082810191909152908452929092019160e001614b74565b5080602084015250508085525050602083019250602081019050614a86565b5092505067ffffffffffffffff60208401351115614ca857600080fd5b614cb88460208501358501614975565b90509250929050565b600082601f830112614cd257600080fd5b81356020614ce2614455836143d9565b8083825260208201915060208460051b870101935086841115614d0457600080fd5b602086015b84811015614a0257614d1a81614119565b8352918301918301614d09565b60008060408385031215614d3a57600080fd5b823567ffffffffffffffff80821115614d5257600080fd5b614d5e86838701614cc1565b93506020850135915080821115614d7457600080fd5b50614d8185828601614cc1565b9150509250929050565b60008083601f840112614d9d57600080fd5b50813567ffffffffffffffff811115614db557600080fd5b6020830191508360208285010111156120e557600080fd5b60008060008060408587031215614de357600080fd5b843567ffffffffffffffff80821115614dfb57600080fd5b614e0788838901614d8b565b90965094506020870135915080821115614e2057600080fd5b50614e2d87828801614d8b565b95989497509550505050565b60008060408385031215614e4c57600080fd5b614e558361477b565b9150614cb860208401614119565b600060208284031215614e7557600080fd5b813567ffffffffffffffff80821115614e8d57600080fd5b9083019060408286031215614ea157600080fd5b614ea96142d4565b823582811115614eb857600080fd5b614ec487828601614cc1565b825250602083013582811115614ed957600080fd5b614ee587828601614cc1565b60208301525095945050505050565b60006020808385031215614f0757600080fd5b823567ffffffffffffffff811115614f1e57600080fd5b8301601f81018513614f2f57600080fd5b8035614f3d614455826143d9565b81815260069190911b82018301908381019087831115614f5c57600080fd5b928401925b82841015614fae5760408489031215614f7a5760008081fd5b614f826142d4565b614f8b85614119565b8152614f9886860161477b565b8187015282526040939093019290840190614f61565b979650505050505050565b600080600080600060808688031215614fd157600080fd5b614fda8661477b565b9450614fe860208701614119565b935060408601359250606086013567ffffffffffffffff81111561500b57600080fd5b61501788828901614d8b565b969995985093965092949392505050565b8381528215156020820152606060408201526000612cb26060830184614199565b60008060008060006060868803121561506157600080fd5b61506a8661477b565b9450602086013567ffffffffffffffff8082111561508757600080fd5b61509389838a01614679565b909650945060408801359150808211156150ac57600080fd5b818801915088601f8301126150c057600080fd5b8135818111156150cf57600080fd5b8960208260061b85010111156150e457600080fd5b9699959850939650602001949392505050565b6000806040838503121561510a57600080fd5b6151138361477b565b9150602083013567ffffffffffffffff81111561512f57600080fd5b830160a0818603121561514157600080fd5b809150509250929050565b80357fffffffff000000000000000000000000000000000000000000000000000000008116811461413d57600080fd5b6000602080838503121561518f57600080fd5b823567ffffffffffffffff8111156151a657600080fd5b8301601f810185136151b757600080fd5b80356151c5614455826143d9565b81815261024091820283018401918482019190888411156151e557600080fd5b938501935b8385101561451957848903818112156152035760008081fd5b61520b6142d4565b6152148761477b565b8152610220807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0840112156152495760008081fd5b615251614343565b925061525e898901614533565b8352604061526d818a01614963565b8a850152606061527e818b0161494f565b8286015260809150615291828b0161494f565b9085015260a06152a28a820161494f565b8286015260c091506152b5828b01614963565b9085015260e06152c68a820161494f565b8286015261010091506152da828b01614963565b908501526101206152ec8a8201614963565b828601526101409150615300828b01614963565b908501526101606153128a820161494f565b828601526101809150615326828b0161494f565b908501526101a06153388a820161494f565b828601526101c0915061534c828b0161477b565b908501526101e061535e8a820161494f565b828601526102009150615372828b01614533565b9085015261538189830161514c565b908401525080880191909152835293840193918501916151ea565b600080604083850312156153af57600080fd5b6153b883614119565b9150614cb86020840161477b565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b8082028115828204841417610f6857610f686153c6565b600082615442577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261547c57600080fd5b83018035915067ffffffffffffffff82111561549757600080fd5b6020019150600681901b36038213156120e557600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b80357bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8116811461413d57600080fd5b60006040828403121561551c57600080fd5b6155246142d4565b61552d83614119565b815261553b602084016154de565b60208201529392505050565b60006040828403121561555957600080fd5b6155616142d4565b61552d8361477b565b6000602080838503121561557d57600080fd5b823567ffffffffffffffff81111561559457600080fd5b8301601f810185136155a557600080fd5b80356155b3614455826143d9565b818152606091820283018401918482019190888411156155d257600080fd5b938501935b838510156145195780858a0312156155ef5760008081fd5b6155f7614367565b61560086614119565b815261560d8787016154de565b87820152604061561e81880161494f565b90820152835293840193918501916155d7565b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8183360301811261566557600080fd5b9190910192915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126156a457600080fd5b83018035915067ffffffffffffffff8211156156bf57600080fd5b6020019150368190038213156120e557600080fd5b80820180821115610f6857610f686153c6565b81810381811115610f6857610f686153c6565b60ff8181168382160190811115610f6857610f686153c6565b60ff8281168282160390811115610f6857610f686153c6565b600181815b8085111561578557817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0482111561576b5761576b6153c6565b8085161561577857918102915b93841c9390800290615731565b509250929050565b60008261579c57506001610f68565b816157a957506000610f68565b81600181146157bf57600281146157c9576157e5565b6001915050610f68565b60ff8411156157da576157da6153c6565b50506001821b610f68565b5060208310610133831016604e8410600b8410161715615808575081810a610f68565b615812838361572c565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115615844576158446153c6565b029392505050565b6000610b8060ff84168361578d565b7fffffffff0000000000000000000000000000000000000000000000000000000081358181169160048510156149475760049490940360031b84901b1690921692915050565b600080858511156158b157600080fd5b838611156158be57600080fd5b5050820193919092039150565b6000604082840312156158dd57600080fd5b6158e56142d4565b82518152602083015161553b81614525565b60006020828403121561590957600080fd5b5051919050565b805169ffffffffffffffffffff8116811461413d57600080fd5b600080600080600060a0868803121561594257600080fd5b61594b86615910565b945060208601519350604086015192506060860151915061596e60808701615910565b90509295509295909350565b60006020828403121561598c57600080fd5b8151610b80816143fd565b6000604082840312156159a957600080fd5b6159b16142d4565b6159ba83614119565b8152602083013560208201528091505092915050565b63ffffffff8181168382160190808211156140ba576140ba6153c6565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfea164736f6c6343000818000a",
-}
-
-var PriceRegistryABI = PriceRegistryMetaData.ABI
-
-var PriceRegistryBin = PriceRegistryMetaData.Bin
-
-func DeployPriceRegistry(auth *bind.TransactOpts, backend bind.ContractBackend, staticConfig PriceRegistryStaticConfig, priceUpdaters []common.Address, feeTokens []common.Address, tokenPriceFeeds []PriceRegistryTokenPriceFeedUpdate, tokenTransferFeeConfigArgs []PriceRegistryTokenTransferFeeConfigArgs, premiumMultiplierWeiPerEthArgs []PriceRegistryPremiumMultiplierWeiPerEthArgs, destChainConfigArgs []PriceRegistryDestChainConfigArgs) (common.Address, *types.Transaction, *PriceRegistry, error) {
-	parsed, err := PriceRegistryMetaData.GetAbi()
-	if err != nil {
-		return common.Address{}, nil, nil, err
-	}
-	if parsed == nil {
-		return common.Address{}, nil, nil, errors.New("GetABI returned nil")
-	}
-
-	address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(PriceRegistryBin), backend, staticConfig, priceUpdaters, feeTokens, tokenPriceFeeds, tokenTransferFeeConfigArgs, premiumMultiplierWeiPerEthArgs, destChainConfigArgs)
-	if err != nil {
-		return common.Address{}, nil, nil, err
-	}
-	return address, tx, &PriceRegistry{address: address, abi: *parsed, PriceRegistryCaller: PriceRegistryCaller{contract: contract}, PriceRegistryTransactor: PriceRegistryTransactor{contract: contract}, PriceRegistryFilterer: PriceRegistryFilterer{contract: contract}}, nil
-}
-
-type PriceRegistry struct {
-	address common.Address
-	abi     abi.ABI
-	PriceRegistryCaller
-	PriceRegistryTransactor
-	PriceRegistryFilterer
-}
-
-type PriceRegistryCaller struct {
-	contract *bind.BoundContract
-}
-
-type PriceRegistryTransactor struct {
-	contract *bind.BoundContract
-}
-
-type PriceRegistryFilterer struct {
-	contract *bind.BoundContract
-}
-
-type PriceRegistrySession struct {
-	Contract     *PriceRegistry
-	CallOpts     bind.CallOpts
-	TransactOpts bind.TransactOpts
-}
-
-type PriceRegistryCallerSession struct {
-	Contract *PriceRegistryCaller
-	CallOpts bind.CallOpts
-}
-
-type PriceRegistryTransactorSession struct {
-	Contract     *PriceRegistryTransactor
-	TransactOpts bind.TransactOpts
-}
-
-type PriceRegistryRaw struct {
-	Contract *PriceRegistry
-}
-
-type PriceRegistryCallerRaw struct {
-	Contract *PriceRegistryCaller
-}
-
-type PriceRegistryTransactorRaw struct {
-	Contract *PriceRegistryTransactor
-}
-
-func NewPriceRegistry(address common.Address, backend bind.ContractBackend) (*PriceRegistry, error) {
-	abi, err := abi.JSON(strings.NewReader(PriceRegistryABI))
-	if err != nil {
-		return nil, err
-	}
-	contract, err := bindPriceRegistry(address, backend, backend, backend)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistry{address: address, abi: abi, PriceRegistryCaller: PriceRegistryCaller{contract: contract}, PriceRegistryTransactor: PriceRegistryTransactor{contract: contract}, PriceRegistryFilterer: PriceRegistryFilterer{contract: contract}}, nil
-}
-
-func NewPriceRegistryCaller(address common.Address, caller bind.ContractCaller) (*PriceRegistryCaller, error) {
-	contract, err := bindPriceRegistry(address, caller, nil, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryCaller{contract: contract}, nil
-}
-
-func NewPriceRegistryTransactor(address common.Address, transactor bind.ContractTransactor) (*PriceRegistryTransactor, error) {
-	contract, err := bindPriceRegistry(address, nil, transactor, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryTransactor{contract: contract}, nil
-}
-
-func NewPriceRegistryFilterer(address common.Address, filterer bind.ContractFilterer) (*PriceRegistryFilterer, error) {
-	contract, err := bindPriceRegistry(address, nil, nil, filterer)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryFilterer{contract: contract}, nil
-}
-
-func bindPriceRegistry(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
-	parsed, err := PriceRegistryMetaData.GetAbi()
-	if err != nil {
-		return nil, err
-	}
-	return bind.NewBoundContract(address, *parsed, caller, transactor, filterer), nil
-}
-
-func (_PriceRegistry *PriceRegistryRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
-	return _PriceRegistry.Contract.PriceRegistryCaller.contract.Call(opts, result, method, params...)
-}
-
-func (_PriceRegistry *PriceRegistryRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.PriceRegistryTransactor.contract.Transfer(opts)
-}
-
-func (_PriceRegistry *PriceRegistryRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.PriceRegistryTransactor.contract.Transact(opts, method, params...)
-}
-
-func (_PriceRegistry *PriceRegistryCallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
-	return _PriceRegistry.Contract.contract.Call(opts, result, method, params...)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.contract.Transfer(opts)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.contract.Transact(opts, method, params...)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) ConvertTokenAmount(opts *bind.CallOpts, fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address) (*big.Int, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "convertTokenAmount", fromToken, fromTokenAmount, toToken)
-
-	if err != nil {
-		return *new(*big.Int), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) ConvertTokenAmount(fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address) (*big.Int, error) {
-	return _PriceRegistry.Contract.ConvertTokenAmount(&_PriceRegistry.CallOpts, fromToken, fromTokenAmount, toToken)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) ConvertTokenAmount(fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address) (*big.Int, error) {
-	return _PriceRegistry.Contract.ConvertTokenAmount(&_PriceRegistry.CallOpts, fromToken, fromTokenAmount, toToken)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetAllAuthorizedCallers(opts *bind.CallOpts) ([]common.Address, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getAllAuthorizedCallers")
-
-	if err != nil {
-		return *new([]common.Address), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new([]common.Address)).(*[]common.Address)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetAllAuthorizedCallers() ([]common.Address, error) {
-	return _PriceRegistry.Contract.GetAllAuthorizedCallers(&_PriceRegistry.CallOpts)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetAllAuthorizedCallers() ([]common.Address, error) {
-	return _PriceRegistry.Contract.GetAllAuthorizedCallers(&_PriceRegistry.CallOpts)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetDestChainConfig(opts *bind.CallOpts, destChainSelector uint64) (PriceRegistryDestChainConfig, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getDestChainConfig", destChainSelector)
-
-	if err != nil {
-		return *new(PriceRegistryDestChainConfig), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(PriceRegistryDestChainConfig)).(*PriceRegistryDestChainConfig)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetDestChainConfig(destChainSelector uint64) (PriceRegistryDestChainConfig, error) {
-	return _PriceRegistry.Contract.GetDestChainConfig(&_PriceRegistry.CallOpts, destChainSelector)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetDestChainConfig(destChainSelector uint64) (PriceRegistryDestChainConfig, error) {
-	return _PriceRegistry.Contract.GetDestChainConfig(&_PriceRegistry.CallOpts, destChainSelector)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetDestinationChainGasPrice(opts *bind.CallOpts, destChainSelector uint64) (InternalTimestampedPackedUint224, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getDestinationChainGasPrice", destChainSelector)
-
-	if err != nil {
-		return *new(InternalTimestampedPackedUint224), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(InternalTimestampedPackedUint224)).(*InternalTimestampedPackedUint224)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetDestinationChainGasPrice(destChainSelector uint64) (InternalTimestampedPackedUint224, error) {
-	return _PriceRegistry.Contract.GetDestinationChainGasPrice(&_PriceRegistry.CallOpts, destChainSelector)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetDestinationChainGasPrice(destChainSelector uint64) (InternalTimestampedPackedUint224, error) {
-	return _PriceRegistry.Contract.GetDestinationChainGasPrice(&_PriceRegistry.CallOpts, destChainSelector)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetFeeTokens(opts *bind.CallOpts) ([]common.Address, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getFeeTokens")
-
-	if err != nil {
-		return *new([]common.Address), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new([]common.Address)).(*[]common.Address)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetFeeTokens() ([]common.Address, error) {
-	return _PriceRegistry.Contract.GetFeeTokens(&_PriceRegistry.CallOpts)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetFeeTokens() ([]common.Address, error) {
-	return _PriceRegistry.Contract.GetFeeTokens(&_PriceRegistry.CallOpts)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetPremiumMultiplierWeiPerEth(opts *bind.CallOpts, token common.Address) (uint64, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getPremiumMultiplierWeiPerEth", token)
-
-	if err != nil {
-		return *new(uint64), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetPremiumMultiplierWeiPerEth(token common.Address) (uint64, error) {
-	return _PriceRegistry.Contract.GetPremiumMultiplierWeiPerEth(&_PriceRegistry.CallOpts, token)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetPremiumMultiplierWeiPerEth(token common.Address) (uint64, error) {
-	return _PriceRegistry.Contract.GetPremiumMultiplierWeiPerEth(&_PriceRegistry.CallOpts, token)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetStaticConfig(opts *bind.CallOpts) (PriceRegistryStaticConfig, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getStaticConfig")
-
-	if err != nil {
-		return *new(PriceRegistryStaticConfig), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(PriceRegistryStaticConfig)).(*PriceRegistryStaticConfig)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetStaticConfig() (PriceRegistryStaticConfig, error) {
-	return _PriceRegistry.Contract.GetStaticConfig(&_PriceRegistry.CallOpts)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetStaticConfig() (PriceRegistryStaticConfig, error) {
-	return _PriceRegistry.Contract.GetStaticConfig(&_PriceRegistry.CallOpts)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetTokenAndGasPrices(opts *bind.CallOpts, token common.Address, destChainSelector uint64) (GetTokenAndGasPrices,
-
-	error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getTokenAndGasPrices", token, destChainSelector)
-
-	outstruct := new(GetTokenAndGasPrices)
-	if err != nil {
-		return *outstruct, err
-	}
-
-	outstruct.TokenPrice = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
-	outstruct.GasPriceValue = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
-
-	return *outstruct, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetTokenAndGasPrices(token common.Address, destChainSelector uint64) (GetTokenAndGasPrices,
-
-	error) {
-	return _PriceRegistry.Contract.GetTokenAndGasPrices(&_PriceRegistry.CallOpts, token, destChainSelector)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetTokenAndGasPrices(token common.Address, destChainSelector uint64) (GetTokenAndGasPrices,
-
-	error) {
-	return _PriceRegistry.Contract.GetTokenAndGasPrices(&_PriceRegistry.CallOpts, token, destChainSelector)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetTokenPrice(opts *bind.CallOpts, token common.Address) (InternalTimestampedPackedUint224, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getTokenPrice", token)
-
-	if err != nil {
-		return *new(InternalTimestampedPackedUint224), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(InternalTimestampedPackedUint224)).(*InternalTimestampedPackedUint224)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetTokenPrice(token common.Address) (InternalTimestampedPackedUint224, error) {
-	return _PriceRegistry.Contract.GetTokenPrice(&_PriceRegistry.CallOpts, token)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetTokenPrice(token common.Address) (InternalTimestampedPackedUint224, error) {
-	return _PriceRegistry.Contract.GetTokenPrice(&_PriceRegistry.CallOpts, token)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetTokenPriceFeedConfig(opts *bind.CallOpts, token common.Address) (IPriceRegistryTokenPriceFeedConfig, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getTokenPriceFeedConfig", token)
-
-	if err != nil {
-		return *new(IPriceRegistryTokenPriceFeedConfig), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(IPriceRegistryTokenPriceFeedConfig)).(*IPriceRegistryTokenPriceFeedConfig)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetTokenPriceFeedConfig(token common.Address) (IPriceRegistryTokenPriceFeedConfig, error) {
-	return _PriceRegistry.Contract.GetTokenPriceFeedConfig(&_PriceRegistry.CallOpts, token)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetTokenPriceFeedConfig(token common.Address) (IPriceRegistryTokenPriceFeedConfig, error) {
-	return _PriceRegistry.Contract.GetTokenPriceFeedConfig(&_PriceRegistry.CallOpts, token)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetTokenPrices(opts *bind.CallOpts, tokens []common.Address) ([]InternalTimestampedPackedUint224, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getTokenPrices", tokens)
-
-	if err != nil {
-		return *new([]InternalTimestampedPackedUint224), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new([]InternalTimestampedPackedUint224)).(*[]InternalTimestampedPackedUint224)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetTokenPrices(tokens []common.Address) ([]InternalTimestampedPackedUint224, error) {
-	return _PriceRegistry.Contract.GetTokenPrices(&_PriceRegistry.CallOpts, tokens)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetTokenPrices(tokens []common.Address) ([]InternalTimestampedPackedUint224, error) {
-	return _PriceRegistry.Contract.GetTokenPrices(&_PriceRegistry.CallOpts, tokens)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetTokenTransferFeeConfig(opts *bind.CallOpts, destChainSelector uint64, token common.Address) (PriceRegistryTokenTransferFeeConfig, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getTokenTransferFeeConfig", destChainSelector, token)
-
-	if err != nil {
-		return *new(PriceRegistryTokenTransferFeeConfig), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(PriceRegistryTokenTransferFeeConfig)).(*PriceRegistryTokenTransferFeeConfig)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetTokenTransferFeeConfig(destChainSelector uint64, token common.Address) (PriceRegistryTokenTransferFeeConfig, error) {
-	return _PriceRegistry.Contract.GetTokenTransferFeeConfig(&_PriceRegistry.CallOpts, destChainSelector, token)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetTokenTransferFeeConfig(destChainSelector uint64, token common.Address) (PriceRegistryTokenTransferFeeConfig, error) {
-	return _PriceRegistry.Contract.GetTokenTransferFeeConfig(&_PriceRegistry.CallOpts, destChainSelector, token)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetValidatedFee(opts *bind.CallOpts, destChainSelector uint64, message ClientEVM2AnyMessage) (*big.Int, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getValidatedFee", destChainSelector, message)
-
-	if err != nil {
-		return *new(*big.Int), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetValidatedFee(destChainSelector uint64, message ClientEVM2AnyMessage) (*big.Int, error) {
-	return _PriceRegistry.Contract.GetValidatedFee(&_PriceRegistry.CallOpts, destChainSelector, message)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetValidatedFee(destChainSelector uint64, message ClientEVM2AnyMessage) (*big.Int, error) {
-	return _PriceRegistry.Contract.GetValidatedFee(&_PriceRegistry.CallOpts, destChainSelector, message)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) GetValidatedTokenPrice(opts *bind.CallOpts, token common.Address) (*big.Int, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "getValidatedTokenPrice", token)
-
-	if err != nil {
-		return *new(*big.Int), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) GetValidatedTokenPrice(token common.Address) (*big.Int, error) {
-	return _PriceRegistry.Contract.GetValidatedTokenPrice(&_PriceRegistry.CallOpts, token)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) GetValidatedTokenPrice(token common.Address) (*big.Int, error) {
-	return _PriceRegistry.Contract.GetValidatedTokenPrice(&_PriceRegistry.CallOpts, token)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) Owner(opts *bind.CallOpts) (common.Address, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "owner")
-
-	if err != nil {
-		return *new(common.Address), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) Owner() (common.Address, error) {
-	return _PriceRegistry.Contract.Owner(&_PriceRegistry.CallOpts)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) Owner() (common.Address, error) {
-	return _PriceRegistry.Contract.Owner(&_PriceRegistry.CallOpts)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) ProcessMessageArgs(opts *bind.CallOpts, destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte) (ProcessMessageArgs,
-
-	error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "processMessageArgs", destChainSelector, feeToken, feeTokenAmount, extraArgs)
-
-	outstruct := new(ProcessMessageArgs)
-	if err != nil {
-		return *outstruct, err
-	}
-
-	outstruct.MsgFeeJuels = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
-	outstruct.IsOutOfOrderExecution = *abi.ConvertType(out[1], new(bool)).(*bool)
-	outstruct.ConvertedExtraArgs = *abi.ConvertType(out[2], new([]byte)).(*[]byte)
-
-	return *outstruct, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) ProcessMessageArgs(destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte) (ProcessMessageArgs,
-
-	error) {
-	return _PriceRegistry.Contract.ProcessMessageArgs(&_PriceRegistry.CallOpts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) ProcessMessageArgs(destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte) (ProcessMessageArgs,
-
-	error) {
-	return _PriceRegistry.Contract.ProcessMessageArgs(&_PriceRegistry.CallOpts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) TypeAndVersion(opts *bind.CallOpts) (string, error) {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "typeAndVersion")
-
-	if err != nil {
-		return *new(string), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(string)).(*string)
-
-	return out0, err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) TypeAndVersion() (string, error) {
-	return _PriceRegistry.Contract.TypeAndVersion(&_PriceRegistry.CallOpts)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) TypeAndVersion() (string, error) {
-	return _PriceRegistry.Contract.TypeAndVersion(&_PriceRegistry.CallOpts)
-}
-
-func (_PriceRegistry *PriceRegistryCaller) ValidatePoolReturnData(opts *bind.CallOpts, destChainSelector uint64, rampTokenAmounts []InternalRampTokenAmount, sourceTokenAmounts []ClientEVMTokenAmount) error {
-	var out []interface{}
-	err := _PriceRegistry.contract.Call(opts, &out, "validatePoolReturnData", destChainSelector, rampTokenAmounts, sourceTokenAmounts)
-
-	if err != nil {
-		return err
-	}
-
-	return err
-
-}
-
-func (_PriceRegistry *PriceRegistrySession) ValidatePoolReturnData(destChainSelector uint64, rampTokenAmounts []InternalRampTokenAmount, sourceTokenAmounts []ClientEVMTokenAmount) error {
-	return _PriceRegistry.Contract.ValidatePoolReturnData(&_PriceRegistry.CallOpts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)
-}
-
-func (_PriceRegistry *PriceRegistryCallerSession) ValidatePoolReturnData(destChainSelector uint64, rampTokenAmounts []InternalRampTokenAmount, sourceTokenAmounts []ClientEVMTokenAmount) error {
-	return _PriceRegistry.Contract.ValidatePoolReturnData(&_PriceRegistry.CallOpts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "acceptOwnership")
-}
-
-func (_PriceRegistry *PriceRegistrySession) AcceptOwnership() (*types.Transaction, error) {
-	return _PriceRegistry.Contract.AcceptOwnership(&_PriceRegistry.TransactOpts)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) AcceptOwnership() (*types.Transaction, error) {
-	return _PriceRegistry.Contract.AcceptOwnership(&_PriceRegistry.TransactOpts)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) ApplyAuthorizedCallerUpdates(opts *bind.TransactOpts, authorizedCallerArgs AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "applyAuthorizedCallerUpdates", authorizedCallerArgs)
-}
-
-func (_PriceRegistry *PriceRegistrySession) ApplyAuthorizedCallerUpdates(authorizedCallerArgs AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.ApplyAuthorizedCallerUpdates(&_PriceRegistry.TransactOpts, authorizedCallerArgs)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) ApplyAuthorizedCallerUpdates(authorizedCallerArgs AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.ApplyAuthorizedCallerUpdates(&_PriceRegistry.TransactOpts, authorizedCallerArgs)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) ApplyDestChainConfigUpdates(opts *bind.TransactOpts, destChainConfigArgs []PriceRegistryDestChainConfigArgs) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "applyDestChainConfigUpdates", destChainConfigArgs)
-}
-
-func (_PriceRegistry *PriceRegistrySession) ApplyDestChainConfigUpdates(destChainConfigArgs []PriceRegistryDestChainConfigArgs) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.ApplyDestChainConfigUpdates(&_PriceRegistry.TransactOpts, destChainConfigArgs)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) ApplyDestChainConfigUpdates(destChainConfigArgs []PriceRegistryDestChainConfigArgs) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.ApplyDestChainConfigUpdates(&_PriceRegistry.TransactOpts, destChainConfigArgs)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) ApplyFeeTokensUpdates(opts *bind.TransactOpts, feeTokensToAdd []common.Address, feeTokensToRemove []common.Address) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "applyFeeTokensUpdates", feeTokensToAdd, feeTokensToRemove)
-}
-
-func (_PriceRegistry *PriceRegistrySession) ApplyFeeTokensUpdates(feeTokensToAdd []common.Address, feeTokensToRemove []common.Address) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.ApplyFeeTokensUpdates(&_PriceRegistry.TransactOpts, feeTokensToAdd, feeTokensToRemove)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) ApplyFeeTokensUpdates(feeTokensToAdd []common.Address, feeTokensToRemove []common.Address) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.ApplyFeeTokensUpdates(&_PriceRegistry.TransactOpts, feeTokensToAdd, feeTokensToRemove)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) ApplyPremiumMultiplierWeiPerEthUpdates(opts *bind.TransactOpts, premiumMultiplierWeiPerEthArgs []PriceRegistryPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "applyPremiumMultiplierWeiPerEthUpdates", premiumMultiplierWeiPerEthArgs)
-}
-
-func (_PriceRegistry *PriceRegistrySession) ApplyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs []PriceRegistryPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.ApplyPremiumMultiplierWeiPerEthUpdates(&_PriceRegistry.TransactOpts, premiumMultiplierWeiPerEthArgs)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) ApplyPremiumMultiplierWeiPerEthUpdates(premiumMultiplierWeiPerEthArgs []PriceRegistryPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.ApplyPremiumMultiplierWeiPerEthUpdates(&_PriceRegistry.TransactOpts, premiumMultiplierWeiPerEthArgs)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) ApplyTokenTransferFeeConfigUpdates(opts *bind.TransactOpts, tokenTransferFeeConfigArgs []PriceRegistryTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []PriceRegistryTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "applyTokenTransferFeeConfigUpdates", tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
-}
-
-func (_PriceRegistry *PriceRegistrySession) ApplyTokenTransferFeeConfigUpdates(tokenTransferFeeConfigArgs []PriceRegistryTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []PriceRegistryTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.ApplyTokenTransferFeeConfigUpdates(&_PriceRegistry.TransactOpts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) ApplyTokenTransferFeeConfigUpdates(tokenTransferFeeConfigArgs []PriceRegistryTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []PriceRegistryTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.ApplyTokenTransferFeeConfigUpdates(&_PriceRegistry.TransactOpts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) OnReport(opts *bind.TransactOpts, metadata []byte, report []byte) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "onReport", metadata, report)
-}
-
-func (_PriceRegistry *PriceRegistrySession) OnReport(metadata []byte, report []byte) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.OnReport(&_PriceRegistry.TransactOpts, metadata, report)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) OnReport(metadata []byte, report []byte) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.OnReport(&_PriceRegistry.TransactOpts, metadata, report)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) SetReportPermissions(opts *bind.TransactOpts, permissions []KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "setReportPermissions", permissions)
-}
-
-func (_PriceRegistry *PriceRegistrySession) SetReportPermissions(permissions []KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.SetReportPermissions(&_PriceRegistry.TransactOpts, permissions)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) SetReportPermissions(permissions []KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.SetReportPermissions(&_PriceRegistry.TransactOpts, permissions)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "transferOwnership", to)
-}
-
-func (_PriceRegistry *PriceRegistrySession) TransferOwnership(to common.Address) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.TransferOwnership(&_PriceRegistry.TransactOpts, to)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) TransferOwnership(to common.Address) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.TransferOwnership(&_PriceRegistry.TransactOpts, to)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) UpdatePrices(opts *bind.TransactOpts, priceUpdates InternalPriceUpdates) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "updatePrices", priceUpdates)
-}
-
-func (_PriceRegistry *PriceRegistrySession) UpdatePrices(priceUpdates InternalPriceUpdates) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.UpdatePrices(&_PriceRegistry.TransactOpts, priceUpdates)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) UpdatePrices(priceUpdates InternalPriceUpdates) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.UpdatePrices(&_PriceRegistry.TransactOpts, priceUpdates)
-}
-
-func (_PriceRegistry *PriceRegistryTransactor) UpdateTokenPriceFeeds(opts *bind.TransactOpts, tokenPriceFeedUpdates []PriceRegistryTokenPriceFeedUpdate) (*types.Transaction, error) {
-	return _PriceRegistry.contract.Transact(opts, "updateTokenPriceFeeds", tokenPriceFeedUpdates)
-}
-
-func (_PriceRegistry *PriceRegistrySession) UpdateTokenPriceFeeds(tokenPriceFeedUpdates []PriceRegistryTokenPriceFeedUpdate) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.UpdateTokenPriceFeeds(&_PriceRegistry.TransactOpts, tokenPriceFeedUpdates)
-}
-
-func (_PriceRegistry *PriceRegistryTransactorSession) UpdateTokenPriceFeeds(tokenPriceFeedUpdates []PriceRegistryTokenPriceFeedUpdate) (*types.Transaction, error) {
-	return _PriceRegistry.Contract.UpdateTokenPriceFeeds(&_PriceRegistry.TransactOpts, tokenPriceFeedUpdates)
-}
-
-type PriceRegistryAuthorizedCallerAddedIterator struct {
-	Event *PriceRegistryAuthorizedCallerAdded
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryAuthorizedCallerAddedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryAuthorizedCallerAdded)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryAuthorizedCallerAdded)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryAuthorizedCallerAddedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryAuthorizedCallerAddedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryAuthorizedCallerAdded struct {
-	Caller common.Address
-	Raw    types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterAuthorizedCallerAdded(opts *bind.FilterOpts) (*PriceRegistryAuthorizedCallerAddedIterator, error) {
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "AuthorizedCallerAdded")
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryAuthorizedCallerAddedIterator{contract: _PriceRegistry.contract, event: "AuthorizedCallerAdded", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchAuthorizedCallerAdded(opts *bind.WatchOpts, sink chan<- *PriceRegistryAuthorizedCallerAdded) (event.Subscription, error) {
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "AuthorizedCallerAdded")
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryAuthorizedCallerAdded)
-				if err := _PriceRegistry.contract.UnpackLog(event, "AuthorizedCallerAdded", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseAuthorizedCallerAdded(log types.Log) (*PriceRegistryAuthorizedCallerAdded, error) {
-	event := new(PriceRegistryAuthorizedCallerAdded)
-	if err := _PriceRegistry.contract.UnpackLog(event, "AuthorizedCallerAdded", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryAuthorizedCallerRemovedIterator struct {
-	Event *PriceRegistryAuthorizedCallerRemoved
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryAuthorizedCallerRemovedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryAuthorizedCallerRemoved)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryAuthorizedCallerRemoved)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryAuthorizedCallerRemovedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryAuthorizedCallerRemovedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryAuthorizedCallerRemoved struct {
-	Caller common.Address
-	Raw    types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterAuthorizedCallerRemoved(opts *bind.FilterOpts) (*PriceRegistryAuthorizedCallerRemovedIterator, error) {
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "AuthorizedCallerRemoved")
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryAuthorizedCallerRemovedIterator{contract: _PriceRegistry.contract, event: "AuthorizedCallerRemoved", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchAuthorizedCallerRemoved(opts *bind.WatchOpts, sink chan<- *PriceRegistryAuthorizedCallerRemoved) (event.Subscription, error) {
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "AuthorizedCallerRemoved")
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryAuthorizedCallerRemoved)
-				if err := _PriceRegistry.contract.UnpackLog(event, "AuthorizedCallerRemoved", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseAuthorizedCallerRemoved(log types.Log) (*PriceRegistryAuthorizedCallerRemoved, error) {
-	event := new(PriceRegistryAuthorizedCallerRemoved)
-	if err := _PriceRegistry.contract.UnpackLog(event, "AuthorizedCallerRemoved", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryDestChainAddedIterator struct {
-	Event *PriceRegistryDestChainAdded
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryDestChainAddedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryDestChainAdded)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryDestChainAdded)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryDestChainAddedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryDestChainAddedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryDestChainAdded struct {
-	DestChainSelector uint64
-	DestChainConfig   PriceRegistryDestChainConfig
-	Raw               types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterDestChainAdded(opts *bind.FilterOpts, destChainSelector []uint64) (*PriceRegistryDestChainAddedIterator, error) {
-
-	var destChainSelectorRule []interface{}
-	for _, destChainSelectorItem := range destChainSelector {
-		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "DestChainAdded", destChainSelectorRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryDestChainAddedIterator{contract: _PriceRegistry.contract, event: "DestChainAdded", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchDestChainAdded(opts *bind.WatchOpts, sink chan<- *PriceRegistryDestChainAdded, destChainSelector []uint64) (event.Subscription, error) {
-
-	var destChainSelectorRule []interface{}
-	for _, destChainSelectorItem := range destChainSelector {
-		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "DestChainAdded", destChainSelectorRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryDestChainAdded)
-				if err := _PriceRegistry.contract.UnpackLog(event, "DestChainAdded", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseDestChainAdded(log types.Log) (*PriceRegistryDestChainAdded, error) {
-	event := new(PriceRegistryDestChainAdded)
-	if err := _PriceRegistry.contract.UnpackLog(event, "DestChainAdded", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryDestChainConfigUpdatedIterator struct {
-	Event *PriceRegistryDestChainConfigUpdated
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryDestChainConfigUpdatedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryDestChainConfigUpdated)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryDestChainConfigUpdated)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryDestChainConfigUpdatedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryDestChainConfigUpdatedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryDestChainConfigUpdated struct {
-	DestChainSelector uint64
-	DestChainConfig   PriceRegistryDestChainConfig
-	Raw               types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterDestChainConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64) (*PriceRegistryDestChainConfigUpdatedIterator, error) {
-
-	var destChainSelectorRule []interface{}
-	for _, destChainSelectorItem := range destChainSelector {
-		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "DestChainConfigUpdated", destChainSelectorRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryDestChainConfigUpdatedIterator{contract: _PriceRegistry.contract, event: "DestChainConfigUpdated", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchDestChainConfigUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryDestChainConfigUpdated, destChainSelector []uint64) (event.Subscription, error) {
-
-	var destChainSelectorRule []interface{}
-	for _, destChainSelectorItem := range destChainSelector {
-		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "DestChainConfigUpdated", destChainSelectorRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryDestChainConfigUpdated)
-				if err := _PriceRegistry.contract.UnpackLog(event, "DestChainConfigUpdated", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseDestChainConfigUpdated(log types.Log) (*PriceRegistryDestChainConfigUpdated, error) {
-	event := new(PriceRegistryDestChainConfigUpdated)
-	if err := _PriceRegistry.contract.UnpackLog(event, "DestChainConfigUpdated", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryFeeTokenAddedIterator struct {
-	Event *PriceRegistryFeeTokenAdded
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryFeeTokenAddedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryFeeTokenAdded)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryFeeTokenAdded)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryFeeTokenAddedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryFeeTokenAddedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryFeeTokenAdded struct {
-	FeeToken common.Address
-	Raw      types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterFeeTokenAdded(opts *bind.FilterOpts, feeToken []common.Address) (*PriceRegistryFeeTokenAddedIterator, error) {
-
-	var feeTokenRule []interface{}
-	for _, feeTokenItem := range feeToken {
-		feeTokenRule = append(feeTokenRule, feeTokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "FeeTokenAdded", feeTokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryFeeTokenAddedIterator{contract: _PriceRegistry.contract, event: "FeeTokenAdded", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchFeeTokenAdded(opts *bind.WatchOpts, sink chan<- *PriceRegistryFeeTokenAdded, feeToken []common.Address) (event.Subscription, error) {
-
-	var feeTokenRule []interface{}
-	for _, feeTokenItem := range feeToken {
-		feeTokenRule = append(feeTokenRule, feeTokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "FeeTokenAdded", feeTokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryFeeTokenAdded)
-				if err := _PriceRegistry.contract.UnpackLog(event, "FeeTokenAdded", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseFeeTokenAdded(log types.Log) (*PriceRegistryFeeTokenAdded, error) {
-	event := new(PriceRegistryFeeTokenAdded)
-	if err := _PriceRegistry.contract.UnpackLog(event, "FeeTokenAdded", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryFeeTokenRemovedIterator struct {
-	Event *PriceRegistryFeeTokenRemoved
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryFeeTokenRemovedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryFeeTokenRemoved)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryFeeTokenRemoved)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryFeeTokenRemovedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryFeeTokenRemovedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryFeeTokenRemoved struct {
-	FeeToken common.Address
-	Raw      types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterFeeTokenRemoved(opts *bind.FilterOpts, feeToken []common.Address) (*PriceRegistryFeeTokenRemovedIterator, error) {
-
-	var feeTokenRule []interface{}
-	for _, feeTokenItem := range feeToken {
-		feeTokenRule = append(feeTokenRule, feeTokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "FeeTokenRemoved", feeTokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryFeeTokenRemovedIterator{contract: _PriceRegistry.contract, event: "FeeTokenRemoved", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchFeeTokenRemoved(opts *bind.WatchOpts, sink chan<- *PriceRegistryFeeTokenRemoved, feeToken []common.Address) (event.Subscription, error) {
-
-	var feeTokenRule []interface{}
-	for _, feeTokenItem := range feeToken {
-		feeTokenRule = append(feeTokenRule, feeTokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "FeeTokenRemoved", feeTokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryFeeTokenRemoved)
-				if err := _PriceRegistry.contract.UnpackLog(event, "FeeTokenRemoved", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseFeeTokenRemoved(log types.Log) (*PriceRegistryFeeTokenRemoved, error) {
-	event := new(PriceRegistryFeeTokenRemoved)
-	if err := _PriceRegistry.contract.UnpackLog(event, "FeeTokenRemoved", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryOwnershipTransferRequestedIterator struct {
-	Event *PriceRegistryOwnershipTransferRequested
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryOwnershipTransferRequestedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryOwnershipTransferRequested)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryOwnershipTransferRequested)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryOwnershipTransferRequestedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryOwnershipTransferRequestedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryOwnershipTransferRequested struct {
-	From common.Address
-	To   common.Address
-	Raw  types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*PriceRegistryOwnershipTransferRequestedIterator, error) {
-
-	var fromRule []interface{}
-	for _, fromItem := range from {
-		fromRule = append(fromRule, fromItem)
-	}
-	var toRule []interface{}
-	for _, toItem := range to {
-		toRule = append(toRule, toItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "OwnershipTransferRequested", fromRule, toRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryOwnershipTransferRequestedIterator{contract: _PriceRegistry.contract, event: "OwnershipTransferRequested", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *PriceRegistryOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
-
-	var fromRule []interface{}
-	for _, fromItem := range from {
-		fromRule = append(fromRule, fromItem)
-	}
-	var toRule []interface{}
-	for _, toItem := range to {
-		toRule = append(toRule, toItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "OwnershipTransferRequested", fromRule, toRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryOwnershipTransferRequested)
-				if err := _PriceRegistry.contract.UnpackLog(event, "OwnershipTransferRequested", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseOwnershipTransferRequested(log types.Log) (*PriceRegistryOwnershipTransferRequested, error) {
-	event := new(PriceRegistryOwnershipTransferRequested)
-	if err := _PriceRegistry.contract.UnpackLog(event, "OwnershipTransferRequested", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryOwnershipTransferredIterator struct {
-	Event *PriceRegistryOwnershipTransferred
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryOwnershipTransferredIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryOwnershipTransferred)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryOwnershipTransferred)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryOwnershipTransferredIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryOwnershipTransferredIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryOwnershipTransferred struct {
-	From common.Address
-	To   common.Address
-	Raw  types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*PriceRegistryOwnershipTransferredIterator, error) {
-
-	var fromRule []interface{}
-	for _, fromItem := range from {
-		fromRule = append(fromRule, fromItem)
-	}
-	var toRule []interface{}
-	for _, toItem := range to {
-		toRule = append(toRule, toItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "OwnershipTransferred", fromRule, toRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryOwnershipTransferredIterator{contract: _PriceRegistry.contract, event: "OwnershipTransferred", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *PriceRegistryOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
-
-	var fromRule []interface{}
-	for _, fromItem := range from {
-		fromRule = append(fromRule, fromItem)
-	}
-	var toRule []interface{}
-	for _, toItem := range to {
-		toRule = append(toRule, toItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "OwnershipTransferred", fromRule, toRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryOwnershipTransferred)
-				if err := _PriceRegistry.contract.UnpackLog(event, "OwnershipTransferred", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseOwnershipTransferred(log types.Log) (*PriceRegistryOwnershipTransferred, error) {
-	event := new(PriceRegistryOwnershipTransferred)
-	if err := _PriceRegistry.contract.UnpackLog(event, "OwnershipTransferred", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator struct {
-	Event *PriceRegistryPremiumMultiplierWeiPerEthUpdated
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryPremiumMultiplierWeiPerEthUpdated)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryPremiumMultiplierWeiPerEthUpdated)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryPremiumMultiplierWeiPerEthUpdated struct {
-	Token                      common.Address
-	PremiumMultiplierWeiPerEth uint64
-	Raw                        types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterPremiumMultiplierWeiPerEthUpdated(opts *bind.FilterOpts, token []common.Address) (*PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator, error) {
-
-	var tokenRule []interface{}
-	for _, tokenItem := range token {
-		tokenRule = append(tokenRule, tokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "PremiumMultiplierWeiPerEthUpdated", tokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator{contract: _PriceRegistry.contract, event: "PremiumMultiplierWeiPerEthUpdated", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchPremiumMultiplierWeiPerEthUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryPremiumMultiplierWeiPerEthUpdated, token []common.Address) (event.Subscription, error) {
-
-	var tokenRule []interface{}
-	for _, tokenItem := range token {
-		tokenRule = append(tokenRule, tokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "PremiumMultiplierWeiPerEthUpdated", tokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryPremiumMultiplierWeiPerEthUpdated)
-				if err := _PriceRegistry.contract.UnpackLog(event, "PremiumMultiplierWeiPerEthUpdated", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParsePremiumMultiplierWeiPerEthUpdated(log types.Log) (*PriceRegistryPremiumMultiplierWeiPerEthUpdated, error) {
-	event := new(PriceRegistryPremiumMultiplierWeiPerEthUpdated)
-	if err := _PriceRegistry.contract.UnpackLog(event, "PremiumMultiplierWeiPerEthUpdated", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryPriceFeedPerTokenUpdatedIterator struct {
-	Event *PriceRegistryPriceFeedPerTokenUpdated
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryPriceFeedPerTokenUpdatedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryPriceFeedPerTokenUpdated)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryPriceFeedPerTokenUpdated)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryPriceFeedPerTokenUpdatedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryPriceFeedPerTokenUpdatedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryPriceFeedPerTokenUpdated struct {
-	Token           common.Address
-	PriceFeedConfig IPriceRegistryTokenPriceFeedConfig
-	Raw             types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterPriceFeedPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*PriceRegistryPriceFeedPerTokenUpdatedIterator, error) {
-
-	var tokenRule []interface{}
-	for _, tokenItem := range token {
-		tokenRule = append(tokenRule, tokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "PriceFeedPerTokenUpdated", tokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryPriceFeedPerTokenUpdatedIterator{contract: _PriceRegistry.contract, event: "PriceFeedPerTokenUpdated", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchPriceFeedPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryPriceFeedPerTokenUpdated, token []common.Address) (event.Subscription, error) {
-
-	var tokenRule []interface{}
-	for _, tokenItem := range token {
-		tokenRule = append(tokenRule, tokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "PriceFeedPerTokenUpdated", tokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryPriceFeedPerTokenUpdated)
-				if err := _PriceRegistry.contract.UnpackLog(event, "PriceFeedPerTokenUpdated", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParsePriceFeedPerTokenUpdated(log types.Log) (*PriceRegistryPriceFeedPerTokenUpdated, error) {
-	event := new(PriceRegistryPriceFeedPerTokenUpdated)
-	if err := _PriceRegistry.contract.UnpackLog(event, "PriceFeedPerTokenUpdated", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryReportPermissionSetIterator struct {
-	Event *PriceRegistryReportPermissionSet
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryReportPermissionSetIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryReportPermissionSet)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryReportPermissionSet)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryReportPermissionSetIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryReportPermissionSetIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryReportPermissionSet struct {
-	ReportId   [32]byte
-	Permission KeystoneFeedsPermissionHandlerPermission
-	Raw        types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterReportPermissionSet(opts *bind.FilterOpts, reportId [][32]byte) (*PriceRegistryReportPermissionSetIterator, error) {
-
-	var reportIdRule []interface{}
-	for _, reportIdItem := range reportId {
-		reportIdRule = append(reportIdRule, reportIdItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "ReportPermissionSet", reportIdRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryReportPermissionSetIterator{contract: _PriceRegistry.contract, event: "ReportPermissionSet", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchReportPermissionSet(opts *bind.WatchOpts, sink chan<- *PriceRegistryReportPermissionSet, reportId [][32]byte) (event.Subscription, error) {
-
-	var reportIdRule []interface{}
-	for _, reportIdItem := range reportId {
-		reportIdRule = append(reportIdRule, reportIdItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "ReportPermissionSet", reportIdRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryReportPermissionSet)
-				if err := _PriceRegistry.contract.UnpackLog(event, "ReportPermissionSet", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseReportPermissionSet(log types.Log) (*PriceRegistryReportPermissionSet, error) {
-	event := new(PriceRegistryReportPermissionSet)
-	if err := _PriceRegistry.contract.UnpackLog(event, "ReportPermissionSet", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryTokenTransferFeeConfigDeletedIterator struct {
-	Event *PriceRegistryTokenTransferFeeConfigDeleted
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryTokenTransferFeeConfigDeletedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryTokenTransferFeeConfigDeleted)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryTokenTransferFeeConfigDeleted)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryTokenTransferFeeConfigDeletedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryTokenTransferFeeConfigDeletedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryTokenTransferFeeConfigDeleted struct {
-	DestChainSelector uint64
-	Token             common.Address
-	Raw               types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterTokenTransferFeeConfigDeleted(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*PriceRegistryTokenTransferFeeConfigDeletedIterator, error) {
-
-	var destChainSelectorRule []interface{}
-	for _, destChainSelectorItem := range destChainSelector {
-		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
-	}
-	var tokenRule []interface{}
-	for _, tokenItem := range token {
-		tokenRule = append(tokenRule, tokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "TokenTransferFeeConfigDeleted", destChainSelectorRule, tokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryTokenTransferFeeConfigDeletedIterator{contract: _PriceRegistry.contract, event: "TokenTransferFeeConfigDeleted", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchTokenTransferFeeConfigDeleted(opts *bind.WatchOpts, sink chan<- *PriceRegistryTokenTransferFeeConfigDeleted, destChainSelector []uint64, token []common.Address) (event.Subscription, error) {
-
-	var destChainSelectorRule []interface{}
-	for _, destChainSelectorItem := range destChainSelector {
-		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
-	}
-	var tokenRule []interface{}
-	for _, tokenItem := range token {
-		tokenRule = append(tokenRule, tokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "TokenTransferFeeConfigDeleted", destChainSelectorRule, tokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryTokenTransferFeeConfigDeleted)
-				if err := _PriceRegistry.contract.UnpackLog(event, "TokenTransferFeeConfigDeleted", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseTokenTransferFeeConfigDeleted(log types.Log) (*PriceRegistryTokenTransferFeeConfigDeleted, error) {
-	event := new(PriceRegistryTokenTransferFeeConfigDeleted)
-	if err := _PriceRegistry.contract.UnpackLog(event, "TokenTransferFeeConfigDeleted", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryTokenTransferFeeConfigUpdatedIterator struct {
-	Event *PriceRegistryTokenTransferFeeConfigUpdated
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryTokenTransferFeeConfigUpdatedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryTokenTransferFeeConfigUpdated)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryTokenTransferFeeConfigUpdated)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryTokenTransferFeeConfigUpdatedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryTokenTransferFeeConfigUpdatedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryTokenTransferFeeConfigUpdated struct {
-	DestChainSelector      uint64
-	Token                  common.Address
-	TokenTransferFeeConfig PriceRegistryTokenTransferFeeConfig
-	Raw                    types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterTokenTransferFeeConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*PriceRegistryTokenTransferFeeConfigUpdatedIterator, error) {
-
-	var destChainSelectorRule []interface{}
-	for _, destChainSelectorItem := range destChainSelector {
-		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
-	}
-	var tokenRule []interface{}
-	for _, tokenItem := range token {
-		tokenRule = append(tokenRule, tokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "TokenTransferFeeConfigUpdated", destChainSelectorRule, tokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryTokenTransferFeeConfigUpdatedIterator{contract: _PriceRegistry.contract, event: "TokenTransferFeeConfigUpdated", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchTokenTransferFeeConfigUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryTokenTransferFeeConfigUpdated, destChainSelector []uint64, token []common.Address) (event.Subscription, error) {
-
-	var destChainSelectorRule []interface{}
-	for _, destChainSelectorItem := range destChainSelector {
-		destChainSelectorRule = append(destChainSelectorRule, destChainSelectorItem)
-	}
-	var tokenRule []interface{}
-	for _, tokenItem := range token {
-		tokenRule = append(tokenRule, tokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "TokenTransferFeeConfigUpdated", destChainSelectorRule, tokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryTokenTransferFeeConfigUpdated)
-				if err := _PriceRegistry.contract.UnpackLog(event, "TokenTransferFeeConfigUpdated", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseTokenTransferFeeConfigUpdated(log types.Log) (*PriceRegistryTokenTransferFeeConfigUpdated, error) {
-	event := new(PriceRegistryTokenTransferFeeConfigUpdated)
-	if err := _PriceRegistry.contract.UnpackLog(event, "TokenTransferFeeConfigUpdated", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryUsdPerTokenUpdatedIterator struct {
-	Event *PriceRegistryUsdPerTokenUpdated
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryUsdPerTokenUpdatedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryUsdPerTokenUpdated)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryUsdPerTokenUpdated)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryUsdPerTokenUpdatedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryUsdPerTokenUpdatedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryUsdPerTokenUpdated struct {
-	Token     common.Address
-	Value     *big.Int
-	Timestamp *big.Int
-	Raw       types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterUsdPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*PriceRegistryUsdPerTokenUpdatedIterator, error) {
-
-	var tokenRule []interface{}
-	for _, tokenItem := range token {
-		tokenRule = append(tokenRule, tokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "UsdPerTokenUpdated", tokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryUsdPerTokenUpdatedIterator{contract: _PriceRegistry.contract, event: "UsdPerTokenUpdated", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchUsdPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryUsdPerTokenUpdated, token []common.Address) (event.Subscription, error) {
-
-	var tokenRule []interface{}
-	for _, tokenItem := range token {
-		tokenRule = append(tokenRule, tokenItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "UsdPerTokenUpdated", tokenRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryUsdPerTokenUpdated)
-				if err := _PriceRegistry.contract.UnpackLog(event, "UsdPerTokenUpdated", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseUsdPerTokenUpdated(log types.Log) (*PriceRegistryUsdPerTokenUpdated, error) {
-	event := new(PriceRegistryUsdPerTokenUpdated)
-	if err := _PriceRegistry.contract.UnpackLog(event, "UsdPerTokenUpdated", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type PriceRegistryUsdPerUnitGasUpdatedIterator struct {
-	Event *PriceRegistryUsdPerUnitGasUpdated
-
-	contract *bind.BoundContract
-	event    string
-
-	logs chan types.Log
-	sub  ethereum.Subscription
-	done bool
-	fail error
-}
-
-func (it *PriceRegistryUsdPerUnitGasUpdatedIterator) Next() bool {
-
-	if it.fail != nil {
-		return false
-	}
-
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(PriceRegistryUsdPerUnitGasUpdated)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-
-	select {
-	case log := <-it.logs:
-		it.Event = new(PriceRegistryUsdPerUnitGasUpdated)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-func (it *PriceRegistryUsdPerUnitGasUpdatedIterator) Error() error {
-	return it.fail
-}
-
-func (it *PriceRegistryUsdPerUnitGasUpdatedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-type PriceRegistryUsdPerUnitGasUpdated struct {
-	DestChain uint64
-	Value     *big.Int
-	Timestamp *big.Int
-	Raw       types.Log
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) FilterUsdPerUnitGasUpdated(opts *bind.FilterOpts, destChain []uint64) (*PriceRegistryUsdPerUnitGasUpdatedIterator, error) {
-
-	var destChainRule []interface{}
-	for _, destChainItem := range destChain {
-		destChainRule = append(destChainRule, destChainItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.FilterLogs(opts, "UsdPerUnitGasUpdated", destChainRule)
-	if err != nil {
-		return nil, err
-	}
-	return &PriceRegistryUsdPerUnitGasUpdatedIterator{contract: _PriceRegistry.contract, event: "UsdPerUnitGasUpdated", logs: logs, sub: sub}, nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) WatchUsdPerUnitGasUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryUsdPerUnitGasUpdated, destChain []uint64) (event.Subscription, error) {
-
-	var destChainRule []interface{}
-	for _, destChainItem := range destChain {
-		destChainRule = append(destChainRule, destChainItem)
-	}
-
-	logs, sub, err := _PriceRegistry.contract.WatchLogs(opts, "UsdPerUnitGasUpdated", destChainRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-
-				event := new(PriceRegistryUsdPerUnitGasUpdated)
-				if err := _PriceRegistry.contract.UnpackLog(event, "UsdPerUnitGasUpdated", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-func (_PriceRegistry *PriceRegistryFilterer) ParseUsdPerUnitGasUpdated(log types.Log) (*PriceRegistryUsdPerUnitGasUpdated, error) {
-	event := new(PriceRegistryUsdPerUnitGasUpdated)
-	if err := _PriceRegistry.contract.UnpackLog(event, "UsdPerUnitGasUpdated", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-type GetTokenAndGasPrices struct {
-	TokenPrice    *big.Int
-	GasPriceValue *big.Int
-}
-type ProcessMessageArgs struct {
-	MsgFeeJuels           *big.Int
-	IsOutOfOrderExecution bool
-	ConvertedExtraArgs    []byte
-}
-
-func (_PriceRegistry *PriceRegistry) ParseLog(log types.Log) (generated.AbigenLog, error) {
-	switch log.Topics[0] {
-	case _PriceRegistry.abi.Events["AuthorizedCallerAdded"].ID:
-		return _PriceRegistry.ParseAuthorizedCallerAdded(log)
-	case _PriceRegistry.abi.Events["AuthorizedCallerRemoved"].ID:
-		return _PriceRegistry.ParseAuthorizedCallerRemoved(log)
-	case _PriceRegistry.abi.Events["DestChainAdded"].ID:
-		return _PriceRegistry.ParseDestChainAdded(log)
-	case _PriceRegistry.abi.Events["DestChainConfigUpdated"].ID:
-		return _PriceRegistry.ParseDestChainConfigUpdated(log)
-	case _PriceRegistry.abi.Events["FeeTokenAdded"].ID:
-		return _PriceRegistry.ParseFeeTokenAdded(log)
-	case _PriceRegistry.abi.Events["FeeTokenRemoved"].ID:
-		return _PriceRegistry.ParseFeeTokenRemoved(log)
-	case _PriceRegistry.abi.Events["OwnershipTransferRequested"].ID:
-		return _PriceRegistry.ParseOwnershipTransferRequested(log)
-	case _PriceRegistry.abi.Events["OwnershipTransferred"].ID:
-		return _PriceRegistry.ParseOwnershipTransferred(log)
-	case _PriceRegistry.abi.Events["PremiumMultiplierWeiPerEthUpdated"].ID:
-		return _PriceRegistry.ParsePremiumMultiplierWeiPerEthUpdated(log)
-	case _PriceRegistry.abi.Events["PriceFeedPerTokenUpdated"].ID:
-		return _PriceRegistry.ParsePriceFeedPerTokenUpdated(log)
-	case _PriceRegistry.abi.Events["ReportPermissionSet"].ID:
-		return _PriceRegistry.ParseReportPermissionSet(log)
-	case _PriceRegistry.abi.Events["TokenTransferFeeConfigDeleted"].ID:
-		return _PriceRegistry.ParseTokenTransferFeeConfigDeleted(log)
-	case _PriceRegistry.abi.Events["TokenTransferFeeConfigUpdated"].ID:
-		return _PriceRegistry.ParseTokenTransferFeeConfigUpdated(log)
-	case _PriceRegistry.abi.Events["UsdPerTokenUpdated"].ID:
-		return _PriceRegistry.ParseUsdPerTokenUpdated(log)
-	case _PriceRegistry.abi.Events["UsdPerUnitGasUpdated"].ID:
-		return _PriceRegistry.ParseUsdPerUnitGasUpdated(log)
-
-	default:
-		return nil, fmt.Errorf("abigen wrapper received unknown log topic: %v", log.Topics[0])
-	}
-}
-
-func (PriceRegistryAuthorizedCallerAdded) Topic() common.Hash {
-	return common.HexToHash("0xeb1b9b92e50b7f88f9ff25d56765095ac6e91540eee214906f4036a908ffbdef")
-}
-
-func (PriceRegistryAuthorizedCallerRemoved) Topic() common.Hash {
-	return common.HexToHash("0xc3803387881faad271c47728894e3e36fac830ffc8602ca6fc07733cbda77580")
-}
-
-func (PriceRegistryDestChainAdded) Topic() common.Hash {
-	return common.HexToHash("0xa937382a486d993de71c220bc8b559242deb4e286a353fa732330b4aa7d13577")
-}
-
-func (PriceRegistryDestChainConfigUpdated) Topic() common.Hash {
-	return common.HexToHash("0xa7b607fc10d28a1caf39ab7d27f4c94945db708a576d572781a455c5894fad93")
-}
-
-func (PriceRegistryFeeTokenAdded) Topic() common.Hash {
-	return common.HexToHash("0xdf1b1bd32a69711488d71554706bb130b1fc63a5fa1a2cd85e8440f84065ba23")
-}
-
-func (PriceRegistryFeeTokenRemoved) Topic() common.Hash {
-	return common.HexToHash("0x1795838dc8ab2ffc5f431a1729a6afa0b587f982f7b2be0b9d7187a1ef547f91")
-}
-
-func (PriceRegistryOwnershipTransferRequested) Topic() common.Hash {
-	return common.HexToHash("0xed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae1278")
-}
-
-func (PriceRegistryOwnershipTransferred) Topic() common.Hash {
-	return common.HexToHash("0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0")
-}
-
-func (PriceRegistryPremiumMultiplierWeiPerEthUpdated) Topic() common.Hash {
-	return common.HexToHash("0xbb77da6f7210cdd16904228a9360133d1d7dfff99b1bc75f128da5b53e28f97d")
-}
-
-func (PriceRegistryPriceFeedPerTokenUpdated) Topic() common.Hash {
-	return common.HexToHash("0x08a5f7f5bb38a81d8e43aca13ecd76431dbf8816ae4699affff7b00b2fc1c464")
-}
-
-func (PriceRegistryReportPermissionSet) Topic() common.Hash {
-	return common.HexToHash("0x32a4ba3fa3351b11ad555d4c8ec70a744e8705607077a946807030d64b6ab1a3")
-}
-
-func (PriceRegistryTokenTransferFeeConfigDeleted) Topic() common.Hash {
-	return common.HexToHash("0x4de5b1bcbca6018c11303a2c3f4a4b4f22a1c741d8c4ba430d246ac06c5ddf8b")
-}
-
-func (PriceRegistryTokenTransferFeeConfigUpdated) Topic() common.Hash {
-	return common.HexToHash("0x94967ae9ea7729ad4f54021c1981765d2b1d954f7c92fbec340aa0a54f46b8b5")
-}
-
-func (PriceRegistryUsdPerTokenUpdated) Topic() common.Hash {
-	return common.HexToHash("0x52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a")
-}
-
-func (PriceRegistryUsdPerUnitGasUpdated) Topic() common.Hash {
-	return common.HexToHash("0xdd84a3fa9ef9409f550d54d6affec7e9c480c878c6ab27b78912a03e1b371c6e")
-}
-
-func (_PriceRegistry *PriceRegistry) Address() common.Address {
-	return _PriceRegistry.address
-}
-
-type PriceRegistryInterface interface {
-	ConvertTokenAmount(opts *bind.CallOpts, fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address) (*big.Int, error)
-
-	GetAllAuthorizedCallers(opts *bind.CallOpts) ([]common.Address, error)
-
-	GetDestChainConfig(opts *bind.CallOpts, destChainSelector uint64) (PriceRegistryDestChainConfig, error)
-
-	GetDestinationChainGasPrice(opts *bind.CallOpts, destChainSelector uint64) (InternalTimestampedPackedUint224, error)
-
-	GetFeeTokens(opts *bind.CallOpts) ([]common.Address, error)
-
-	GetPremiumMultiplierWeiPerEth(opts *bind.CallOpts, token common.Address) (uint64, error)
-
-	GetStaticConfig(opts *bind.CallOpts) (PriceRegistryStaticConfig, error)
-
-	GetTokenAndGasPrices(opts *bind.CallOpts, token common.Address, destChainSelector uint64) (GetTokenAndGasPrices,
-
-		error)
-
-	GetTokenPrice(opts *bind.CallOpts, token common.Address) (InternalTimestampedPackedUint224, error)
-
-	GetTokenPriceFeedConfig(opts *bind.CallOpts, token common.Address) (IPriceRegistryTokenPriceFeedConfig, error)
-
-	GetTokenPrices(opts *bind.CallOpts, tokens []common.Address) ([]InternalTimestampedPackedUint224, error)
-
-	GetTokenTransferFeeConfig(opts *bind.CallOpts, destChainSelector uint64, token common.Address) (PriceRegistryTokenTransferFeeConfig, error)
-
-	GetValidatedFee(opts *bind.CallOpts, destChainSelector uint64, message ClientEVM2AnyMessage) (*big.Int, error)
-
-	GetValidatedTokenPrice(opts *bind.CallOpts, token common.Address) (*big.Int, error)
-
-	Owner(opts *bind.CallOpts) (common.Address, error)
-
-	ProcessMessageArgs(opts *bind.CallOpts, destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte) (ProcessMessageArgs,
-
-		error)
-
-	TypeAndVersion(opts *bind.CallOpts) (string, error)
-
-	ValidatePoolReturnData(opts *bind.CallOpts, destChainSelector uint64, rampTokenAmounts []InternalRampTokenAmount, sourceTokenAmounts []ClientEVMTokenAmount) error
-
-	AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error)
-
-	ApplyAuthorizedCallerUpdates(opts *bind.TransactOpts, authorizedCallerArgs AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error)
-
-	ApplyDestChainConfigUpdates(opts *bind.TransactOpts, destChainConfigArgs []PriceRegistryDestChainConfigArgs) (*types.Transaction, error)
-
-	ApplyFeeTokensUpdates(opts *bind.TransactOpts, feeTokensToAdd []common.Address, feeTokensToRemove []common.Address) (*types.Transaction, error)
-
-	ApplyPremiumMultiplierWeiPerEthUpdates(opts *bind.TransactOpts, premiumMultiplierWeiPerEthArgs []PriceRegistryPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error)
-
-	ApplyTokenTransferFeeConfigUpdates(opts *bind.TransactOpts, tokenTransferFeeConfigArgs []PriceRegistryTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []PriceRegistryTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error)
-
-	OnReport(opts *bind.TransactOpts, metadata []byte, report []byte) (*types.Transaction, error)
-
-	SetReportPermissions(opts *bind.TransactOpts, permissions []KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error)
-
-	TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error)
-
-	UpdatePrices(opts *bind.TransactOpts, priceUpdates InternalPriceUpdates) (*types.Transaction, error)
-
-	UpdateTokenPriceFeeds(opts *bind.TransactOpts, tokenPriceFeedUpdates []PriceRegistryTokenPriceFeedUpdate) (*types.Transaction, error)
-
-	FilterAuthorizedCallerAdded(opts *bind.FilterOpts) (*PriceRegistryAuthorizedCallerAddedIterator, error)
-
-	WatchAuthorizedCallerAdded(opts *bind.WatchOpts, sink chan<- *PriceRegistryAuthorizedCallerAdded) (event.Subscription, error)
-
-	ParseAuthorizedCallerAdded(log types.Log) (*PriceRegistryAuthorizedCallerAdded, error)
-
-	FilterAuthorizedCallerRemoved(opts *bind.FilterOpts) (*PriceRegistryAuthorizedCallerRemovedIterator, error)
-
-	WatchAuthorizedCallerRemoved(opts *bind.WatchOpts, sink chan<- *PriceRegistryAuthorizedCallerRemoved) (event.Subscription, error)
-
-	ParseAuthorizedCallerRemoved(log types.Log) (*PriceRegistryAuthorizedCallerRemoved, error)
-
-	FilterDestChainAdded(opts *bind.FilterOpts, destChainSelector []uint64) (*PriceRegistryDestChainAddedIterator, error)
-
-	WatchDestChainAdded(opts *bind.WatchOpts, sink chan<- *PriceRegistryDestChainAdded, destChainSelector []uint64) (event.Subscription, error)
-
-	ParseDestChainAdded(log types.Log) (*PriceRegistryDestChainAdded, error)
-
-	FilterDestChainConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64) (*PriceRegistryDestChainConfigUpdatedIterator, error)
-
-	WatchDestChainConfigUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryDestChainConfigUpdated, destChainSelector []uint64) (event.Subscription, error)
-
-	ParseDestChainConfigUpdated(log types.Log) (*PriceRegistryDestChainConfigUpdated, error)
-
-	FilterFeeTokenAdded(opts *bind.FilterOpts, feeToken []common.Address) (*PriceRegistryFeeTokenAddedIterator, error)
-
-	WatchFeeTokenAdded(opts *bind.WatchOpts, sink chan<- *PriceRegistryFeeTokenAdded, feeToken []common.Address) (event.Subscription, error)
-
-	ParseFeeTokenAdded(log types.Log) (*PriceRegistryFeeTokenAdded, error)
-
-	FilterFeeTokenRemoved(opts *bind.FilterOpts, feeToken []common.Address) (*PriceRegistryFeeTokenRemovedIterator, error)
-
-	WatchFeeTokenRemoved(opts *bind.WatchOpts, sink chan<- *PriceRegistryFeeTokenRemoved, feeToken []common.Address) (event.Subscription, error)
-
-	ParseFeeTokenRemoved(log types.Log) (*PriceRegistryFeeTokenRemoved, error)
-
-	FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*PriceRegistryOwnershipTransferRequestedIterator, error)
-
-	WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *PriceRegistryOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error)
-
-	ParseOwnershipTransferRequested(log types.Log) (*PriceRegistryOwnershipTransferRequested, error)
-
-	FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*PriceRegistryOwnershipTransferredIterator, error)
-
-	WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *PriceRegistryOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error)
-
-	ParseOwnershipTransferred(log types.Log) (*PriceRegistryOwnershipTransferred, error)
-
-	FilterPremiumMultiplierWeiPerEthUpdated(opts *bind.FilterOpts, token []common.Address) (*PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator, error)
-
-	WatchPremiumMultiplierWeiPerEthUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryPremiumMultiplierWeiPerEthUpdated, token []common.Address) (event.Subscription, error)
-
-	ParsePremiumMultiplierWeiPerEthUpdated(log types.Log) (*PriceRegistryPremiumMultiplierWeiPerEthUpdated, error)
-
-	FilterPriceFeedPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*PriceRegistryPriceFeedPerTokenUpdatedIterator, error)
-
-	WatchPriceFeedPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryPriceFeedPerTokenUpdated, token []common.Address) (event.Subscription, error)
-
-	ParsePriceFeedPerTokenUpdated(log types.Log) (*PriceRegistryPriceFeedPerTokenUpdated, error)
-
-	FilterReportPermissionSet(opts *bind.FilterOpts, reportId [][32]byte) (*PriceRegistryReportPermissionSetIterator, error)
-
-	WatchReportPermissionSet(opts *bind.WatchOpts, sink chan<- *PriceRegistryReportPermissionSet, reportId [][32]byte) (event.Subscription, error)
-
-	ParseReportPermissionSet(log types.Log) (*PriceRegistryReportPermissionSet, error)
-
-	FilterTokenTransferFeeConfigDeleted(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*PriceRegistryTokenTransferFeeConfigDeletedIterator, error)
-
-	WatchTokenTransferFeeConfigDeleted(opts *bind.WatchOpts, sink chan<- *PriceRegistryTokenTransferFeeConfigDeleted, destChainSelector []uint64, token []common.Address) (event.Subscription, error)
-
-	ParseTokenTransferFeeConfigDeleted(log types.Log) (*PriceRegistryTokenTransferFeeConfigDeleted, error)
-
-	FilterTokenTransferFeeConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*PriceRegistryTokenTransferFeeConfigUpdatedIterator, error)
-
-	WatchTokenTransferFeeConfigUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryTokenTransferFeeConfigUpdated, destChainSelector []uint64, token []common.Address) (event.Subscription, error)
-
-	ParseTokenTransferFeeConfigUpdated(log types.Log) (*PriceRegistryTokenTransferFeeConfigUpdated, error)
-
-	FilterUsdPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*PriceRegistryUsdPerTokenUpdatedIterator, error)
-
-	WatchUsdPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryUsdPerTokenUpdated, token []common.Address) (event.Subscription, error)
-
-	ParseUsdPerTokenUpdated(log types.Log) (*PriceRegistryUsdPerTokenUpdated, error)
-
-	FilterUsdPerUnitGasUpdated(opts *bind.FilterOpts, destChain []uint64) (*PriceRegistryUsdPerUnitGasUpdatedIterator, error)
-
-	WatchUsdPerUnitGasUpdated(opts *bind.WatchOpts, sink chan<- *PriceRegistryUsdPerUnitGasUpdated, destChain []uint64) (event.Subscription, error)
-
-	ParseUsdPerUnitGasUpdated(log types.Log) (*PriceRegistryUsdPerUnitGasUpdated, error)
-
-	ParseLog(log types.Log) (generated.AbigenLog, error)
-
-	Address() common.Address
-}
diff --git a/core/gethwrappers/ccip/generated/report_codec/report_codec.go b/core/gethwrappers/ccip/generated/report_codec/report_codec.go
index 7afd3d9bba..0080cfc419 100644
--- a/core/gethwrappers/ccip/generated/report_codec/report_codec.go
+++ b/core/gethwrappers/ccip/generated/report_codec/report_codec.go
@@ -70,6 +70,7 @@ type InternalRampTokenAmount struct {
 	DestTokenAddress  []byte
 	ExtraData         []byte
 	Amount            *big.Int
+	DestExecData      []byte
 }
 
 type InternalTokenPriceUpdate struct {
@@ -94,8 +95,8 @@ type OffRampMerkleRoot struct {
 }
 
 var ReportCodecMetaData = &bind.MetaData{
-	ABI: "[{\"anonymous\":false,\"inputs\":[{\"components\":[{\"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\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.MerkleRoot[]\",\"name\":\"merkleRoots\",\"type\":\"tuple[]\"}],\"indexed\":false,\"internalType\":\"structOffRamp.CommitReport\",\"name\":\"report\",\"type\":\"tuple\"}],\"name\":\"CommitReportDecoded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.Any2EVMRampMessage[]\",\"name\":\"messages\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes[][]\",\"name\":\"offchainTokenData\",\"type\":\"bytes[][]\"},{\"internalType\":\"bytes32[]\",\"name\":\"proofs\",\"type\":\"bytes32[]\"},{\"internalType\":\"uint256\",\"name\":\"proofFlagBits\",\"type\":\"uint256\"}],\"indexed\":false,\"internalType\":\"structInternal.ExecutionReportSingleChain[]\",\"name\":\"report\",\"type\":\"tuple[]\"}],\"name\":\"ExecuteReportDecoded\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"}],\"name\":\"decodeCommitReport\",\"outputs\":[{\"components\":[{\"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\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.MerkleRoot[]\",\"name\":\"merkleRoots\",\"type\":\"tuple[]\"}],\"internalType\":\"structOffRamp.CommitReport\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"}],\"name\":\"decodeExecuteReport\",\"outputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"destTokenAddress\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.Any2EVMRampMessage[]\",\"name\":\"messages\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes[][]\",\"name\":\"offchainTokenData\",\"type\":\"bytes[][]\"},{\"internalType\":\"bytes32[]\",\"name\":\"proofs\",\"type\":\"bytes32[]\"},{\"internalType\":\"uint256\",\"name\":\"proofFlagBits\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.ExecutionReportSingleChain[]\",\"name\":\"\",\"type\":\"tuple[]\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]",
-	Bin: "0x608060405234801561001057600080fd5b5061124f806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80636fb349561461003b578063f816ec6014610064575b600080fd5b61004e61004936600461024f565b610084565b60405161005b91906104f5565b60405180910390f35b61007761007236600461024f565b6100a0565b60405161005b91906107ae565b60608180602001905181019061009a9190610dc3565b92915050565b604080516080810182526060918101828152828201839052815260208101919091528180602001905181019061009a91906110d9565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60405160a0810167ffffffffffffffff81118282101715610128576101286100d6565b60405290565b6040516080810167ffffffffffffffff81118282101715610128576101286100d6565b60405160c0810167ffffffffffffffff81118282101715610128576101286100d6565b6040805190810167ffffffffffffffff81118282101715610128576101286100d6565b6040516060810167ffffffffffffffff81118282101715610128576101286100d6565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715610201576102016100d6565b604052919050565b600067ffffffffffffffff821115610223576102236100d6565b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01660200190565b60006020828403121561026157600080fd5b813567ffffffffffffffff81111561027857600080fd5b8201601f8101841361028957600080fd5b803561029c61029782610209565b6101ba565b8181528560208385010111156102b157600080fd5b81602084016020830137600091810160200191909152949350505050565b60005b838110156102ea5781810151838201526020016102d2565b50506000910152565b6000815180845261030b8160208601602086016102cf565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600082825180855260208086019550808260051b84010181860160005b848110156103f2577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe086840301895281516080815181865261039e828701826102f3565b91505085820151858203878701526103b682826102f3565b915050604080830151868303828801526103d083826102f3565b606094850151979094019690965250509884019892509083019060010161035a565b5090979650505050505050565b6000828251808552602080860195506005818360051b8501018287016000805b868110156104aa577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe088850381018c5283518051808752908801908887019080891b88018a01865b8281101561049357858a83030184526104818286516102f3565b948c0194938c01939150600101610467565b509e8a019e9750505093870193505060010161041f565b50919998505050505050505050565b60008151808452602080850194506020840160005b838110156104ea578151875295820195908201906001016104ce565b509495945050505050565b6000602080830181845280855180835260408601915060408160051b870101925083870160005b828110156106dd577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0888603018452815160a0860167ffffffffffffffff8083511688528883015160a08a8a015282815180855260c08b01915060c08160051b8c010194508b8301925060005b81811015610686577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff408c87030183528351805180518852868f820151168f890152866040820151166040890152866060820151166060890152866080820151166080890152508d81015161014060a08901526106096101408901826102f3565b9050604082015188820360c08a015261062282826102f3565b915050606082015161064c60e08a018273ffffffffffffffffffffffffffffffffffffffff169052565b50608082015161010089015260a08201519150878103610120890152610672818361033d565b97505050928c0192918c0191600101610589565b5050505050604082015187820360408901526106a282826103ff565b915050606082015187820360608901526106bc82826104b9565b6080938401519890930197909752509450928501929085019060010161051c565b5092979650505050505050565b60008151808452602080850194506020840160005b838110156104ea578151805167ffffffffffffffff1688528301517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1683880152604090960195908201906001016106ff565b600081518084526020808501945080840160005b838110156104ea578151805167ffffffffffffffff90811689528482015180518216868b0152850151166040808a01919091520151606088015260809096019590820190600101610762565b6000602080835283516040808386015260a0850182516040606088015281815180845260c0890191508683019350600092505b8083101561083e578351805173ffffffffffffffffffffffffffffffffffffffff1683528701517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16878301529286019260019290920191908401906107e1565b50938501518785037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa00160808901529361087881866106ea565b9450505050508185015191507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08482030160408501526108b8818361074e565b95945050505050565b600067ffffffffffffffff8211156108db576108db6100d6565b5060051b60200190565b805167ffffffffffffffff811681146108fd57600080fd5b919050565b600060a0828403121561091457600080fd5b61091c610105565b90508151815261092e602083016108e5565b602082015261093f604083016108e5565b6040820152610950606083016108e5565b6060820152610961608083016108e5565b608082015292915050565b600082601f83011261097d57600080fd5b815161098b61029782610209565b8181528460208386010111156109a057600080fd5b6109b18260208301602087016102cf565b949350505050565b805173ffffffffffffffffffffffffffffffffffffffff811681146108fd57600080fd5b600082601f8301126109ee57600080fd5b815160206109fe610297836108c1565b82815260059290921b84018101918181019086841115610a1d57600080fd5b8286015b84811015610b1157805167ffffffffffffffff80821115610a425760008081fd5b81890191506080807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0848d03011215610a7b5760008081fd5b610a8361012e565b8784015183811115610a955760008081fd5b610aa38d8a8388010161096c565b82525060408085015184811115610aba5760008081fd5b610ac88e8b8389010161096c565b8a8401525060608086015185811115610ae15760008081fd5b610aef8f8c838a010161096c565b9284019290925294909201519381019390935250508352918301918301610a21565b509695505050505050565b600082601f830112610b2d57600080fd5b81516020610b3d610297836108c1565b82815260059290921b84018101918181019086841115610b5c57600080fd5b8286015b84811015610b1157805167ffffffffffffffff80821115610b815760008081fd5b8189019150610140807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0848d03011215610bbb5760008081fd5b610bc3610151565b610bcf8c898601610902565b815260c084015183811115610be45760008081fd5b610bf28d8a8388010161096c565b898301525060e084015183811115610c0a5760008081fd5b610c188d8a8388010161096c565b604083015250610c2b61010085016109b9565b60608201526101208401516080820152908301519082821115610c4e5760008081fd5b610c5c8c89848701016109dd565b60a08201528652505050918301918301610b60565b600082601f830112610c8257600080fd5b81516020610c92610297836108c1565b82815260059290921b84018101918181019086841115610cb157600080fd5b8286015b84811015610b1157805167ffffffffffffffff80821115610cd557600080fd5b818901915089603f830112610ce957600080fd5b85820151610cf9610297826108c1565b81815260059190911b830160400190878101908c831115610d1957600080fd5b604085015b83811015610d5257805185811115610d3557600080fd5b610d448f6040838a010161096c565b845250918901918901610d1e565b50875250505092840192508301610cb5565b600082601f830112610d7557600080fd5b81516020610d85610297836108c1565b8083825260208201915060208460051b870101935086841115610da757600080fd5b602086015b84811015610b115780518352918301918301610dac565b60006020808385031215610dd657600080fd5b825167ffffffffffffffff80821115610dee57600080fd5b818501915085601f830112610e0257600080fd5b8151610e10610297826108c1565b81815260059190911b83018401908481019088831115610e2f57600080fd5b8585015b83811015610f2957805185811115610e4a57600080fd5b860160a0818c037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0011215610e7f5760008081fd5b610e87610105565b610e928983016108e5565b815260408083015188811115610ea85760008081fd5b610eb68e8c83870101610b1c565b8b8401525060608084015189811115610ecf5760008081fd5b610edd8f8d83880101610c71565b8385015250608091508184015189811115610ef85760008081fd5b610f068f8d83880101610d64565b918401919091525060a09290920151918101919091528352918601918601610e33565b5098975050505050505050565b80517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811681146108fd57600080fd5b600082601f830112610f7357600080fd5b81516020610f83610297836108c1565b82815260069290921b84018101918181019086841115610fa257600080fd5b8286015b84811015610b115760408189031215610fbf5760008081fd5b610fc7610174565b610fd0826108e5565b8152610fdd858301610f36565b81860152835291830191604001610fa6565b600082601f83011261100057600080fd5b81516020611010610297836108c1565b82815260079290921b8401810191818101908684111561102f57600080fd5b8286015b84811015610b1157808803608081121561104d5760008081fd5b611055610197565b61105e836108e5565b81526040807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0840112156110925760008081fd5b61109a610174565b92506110a78785016108e5565b83526110b48185016108e5565b8388015281870192909252606083015191810191909152835291830191608001611033565b600060208083850312156110ec57600080fd5b825167ffffffffffffffff8082111561110457600080fd5b8185019150604080838803121561111a57600080fd5b611122610174565b83518381111561113157600080fd5b84016040818a03121561114357600080fd5b61114b610174565b81518581111561115a57600080fd5b8201601f81018b1361116b57600080fd5b8051611179610297826108c1565b81815260069190911b8201890190898101908d83111561119857600080fd5b928a01925b828410156111e65787848f0312156111b55760008081fd5b6111bd610174565b6111c6856109b9565b81526111d38c8601610f36565b818d0152825292870192908a019061119d565b8452505050818701519350848411156111fe57600080fd5b61120a8a858401610f62565b818801528252508385015191508282111561122457600080fd5b61123088838601610fef565b8582015280955050505050509291505056fea164736f6c6343000818000a",
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"components\":[{\"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\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.MerkleRoot[]\",\"name\":\"merkleRoots\",\"type\":\"tuple[]\"}],\"indexed\":false,\"internalType\":\"structOffRamp.CommitReport\",\"name\":\"report\",\"type\":\"tuple\"}],\"name\":\"CommitReportDecoded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"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.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.Any2EVMRampMessage[]\",\"name\":\"messages\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes[][]\",\"name\":\"offchainTokenData\",\"type\":\"bytes[][]\"},{\"internalType\":\"bytes32[]\",\"name\":\"proofs\",\"type\":\"bytes32[]\"},{\"internalType\":\"uint256\",\"name\":\"proofFlagBits\",\"type\":\"uint256\"}],\"indexed\":false,\"internalType\":\"structInternal.ExecutionReportSingleChain[]\",\"name\":\"report\",\"type\":\"tuple[]\"}],\"name\":\"ExecuteReportDecoded\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"}],\"name\":\"decodeCommitReport\",\"outputs\":[{\"components\":[{\"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\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"min\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"max\",\"type\":\"uint64\"}],\"internalType\":\"structOffRamp.Interval\",\"name\":\"interval\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"merkleRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structOffRamp.MerkleRoot[]\",\"name\":\"merkleRoots\",\"type\":\"tuple[]\"}],\"internalType\":\"structOffRamp.CommitReport\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"}],\"name\":\"decodeExecuteReport\",\"outputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"destChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"sequenceNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"internalType\":\"structInternal.RampMessageHeader\",\"name\":\"header\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"address\",\"name\":\"receiver\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"components\":[{\"internalType\":\"bytes\",\"name\":\"sourcePoolAddress\",\"type\":\"bytes\"},{\"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.RampTokenAmount[]\",\"name\":\"tokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structInternal.Any2EVMRampMessage[]\",\"name\":\"messages\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes[][]\",\"name\":\"offchainTokenData\",\"type\":\"bytes[][]\"},{\"internalType\":\"bytes32[]\",\"name\":\"proofs\",\"type\":\"bytes32[]\"},{\"internalType\":\"uint256\",\"name\":\"proofFlagBits\",\"type\":\"uint256\"}],\"internalType\":\"structInternal.ExecutionReportSingleChain[]\",\"name\":\"\",\"type\":\"tuple[]\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]",
+	Bin: "0x608060405234801561001057600080fd5b5061126d806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80636fb349561461003b578063f816ec6014610064575b600080fd5b61004e61004936600461022c565b610084565b60405161005b91906104ed565b60405180910390f35b61007761007236600461022c565b6100a0565b60405161005b91906107a6565b60608180602001905181019061009a9190610de1565b92915050565b604080516080810182526060918101828152828201839052815260208101919091528180602001905181019061009a91906110f7565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60405160a0810167ffffffffffffffff81118282101715610128576101286100d6565b60405290565b60405160c0810167ffffffffffffffff81118282101715610128576101286100d6565b6040805190810167ffffffffffffffff81118282101715610128576101286100d6565b6040516060810167ffffffffffffffff81118282101715610128576101286100d6565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156101de576101de6100d6565b604052919050565b600067ffffffffffffffff821115610200576102006100d6565b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01660200190565b60006020828403121561023e57600080fd5b813567ffffffffffffffff81111561025557600080fd5b8201601f8101841361026657600080fd5b8035610279610274826101e6565b610197565b81815285602083850101111561028e57600080fd5b81602084016020830137600091810160200191909152949350505050565b60005b838110156102c75781810151838201526020016102af565b50506000910152565b600081518084526102e88160208601602086016102ac565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600082825180855260208086019550808260051b84010181860160005b848110156103ea577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0868403018952815160a0815181865261037b828701826102d0565b915050858201518582038787015261039382826102d0565b915050604080830151868303828801526103ad83826102d0565b925050506060808301518187015250608080830151925085820381870152506103d681836102d0565b9a86019a9450505090830190600101610337565b5090979650505050505050565b6000828251808552602080860195506005818360051b8501018287016000805b868110156104a2577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe088850381018c5283518051808752908801908887019080891b88018a01865b8281101561048b57858a83030184526104798286516102d0565b948c0194938c0193915060010161045f565b509e8a019e97505050938701935050600101610417565b50919998505050505050505050565b60008151808452602080850194506020840160005b838110156104e2578151875295820195908201906001016104c6565b509495945050505050565b6000602080830181845280855180835260408601915060408160051b870101925083870160005b828110156106d5577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0888603018452815160a0860167ffffffffffffffff8083511688528883015160a08a8a015282815180855260c08b01915060c08160051b8c010194508b8301925060005b8181101561067e577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff408c87030183528351805180518852868f820151168f890152866040820151166040890152866060820151166060890152866080820151166080890152508d81015161014060a08901526106016101408901826102d0565b9050604082015188820360c08a015261061a82826102d0565b915050606082015161064460e08a018273ffffffffffffffffffffffffffffffffffffffff169052565b50608082015161010089015260a0820151915087810361012089015261066a818361031a565b97505050928c0192918c0191600101610581565b50505050506040820151878203604089015261069a82826103f7565b915050606082015187820360608901526106b482826104b1565b60809384015198909301979097525094509285019290850190600101610514565b5092979650505050505050565b60008151808452602080850194506020840160005b838110156104e2578151805167ffffffffffffffff1688528301517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1683880152604090960195908201906001016106f7565b600081518084526020808501945080840160005b838110156104e2578151805167ffffffffffffffff90811689528482015180518216868b0152850151166040808a0191909152015160608801526080909601959082019060010161075a565b6000602080835283516040808386015260a0850182516040606088015281815180845260c0890191508683019350600092505b80831015610836578351805173ffffffffffffffffffffffffffffffffffffffff1683528701517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16878301529286019260019290920191908401906107d9565b50938501518785037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa00160808901529361087081866106e2565b9450505050508185015191507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08482030160408501526108b08183610746565b95945050505050565b600067ffffffffffffffff8211156108d3576108d36100d6565b5060051b60200190565b805167ffffffffffffffff811681146108f557600080fd5b919050565b600060a0828403121561090c57600080fd5b610914610105565b905081518152610926602083016108dd565b6020820152610937604083016108dd565b6040820152610948606083016108dd565b6060820152610959608083016108dd565b608082015292915050565b600082601f83011261097557600080fd5b8151610983610274826101e6565b81815284602083860101111561099857600080fd5b6109a98260208301602087016102ac565b949350505050565b805173ffffffffffffffffffffffffffffffffffffffff811681146108f557600080fd5b600082601f8301126109e657600080fd5b815160206109f6610274836108b9565b82815260059290921b84018101918181019086841115610a1557600080fd5b8286015b84811015610b2f57805167ffffffffffffffff80821115610a3a5760008081fd5b818901915060a0807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0848d03011215610a735760008081fd5b610a7b610105565b8784015183811115610a8d5760008081fd5b610a9b8d8a83880101610964565b82525060408085015184811115610ab25760008081fd5b610ac08e8b83890101610964565b8a8401525060608086015185811115610ad95760008081fd5b610ae78f8c838a0101610964565b83850152506080915081860151818401525082850151925083831115610b0d5760008081fd5b610b1b8d8a85880101610964565b908201528652505050918301918301610a19565b509695505050505050565b600082601f830112610b4b57600080fd5b81516020610b5b610274836108b9565b82815260059290921b84018101918181019086841115610b7a57600080fd5b8286015b84811015610b2f57805167ffffffffffffffff80821115610b9f5760008081fd5b8189019150610140807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0848d03011215610bd95760008081fd5b610be161012e565b610bed8c8986016108fa565b815260c084015183811115610c025760008081fd5b610c108d8a83880101610964565b898301525060e084015183811115610c285760008081fd5b610c368d8a83880101610964565b604083015250610c4961010085016109b1565b60608201526101208401516080820152908301519082821115610c6c5760008081fd5b610c7a8c89848701016109d5565b60a08201528652505050918301918301610b7e565b600082601f830112610ca057600080fd5b81516020610cb0610274836108b9565b82815260059290921b84018101918181019086841115610ccf57600080fd5b8286015b84811015610b2f57805167ffffffffffffffff80821115610cf357600080fd5b818901915089603f830112610d0757600080fd5b85820151610d17610274826108b9565b81815260059190911b830160400190878101908c831115610d3757600080fd5b604085015b83811015610d7057805185811115610d5357600080fd5b610d628f6040838a0101610964565b845250918901918901610d3c565b50875250505092840192508301610cd3565b600082601f830112610d9357600080fd5b81516020610da3610274836108b9565b8083825260208201915060208460051b870101935086841115610dc557600080fd5b602086015b84811015610b2f5780518352918301918301610dca565b60006020808385031215610df457600080fd5b825167ffffffffffffffff80821115610e0c57600080fd5b818501915085601f830112610e2057600080fd5b8151610e2e610274826108b9565b81815260059190911b83018401908481019088831115610e4d57600080fd5b8585015b83811015610f4757805185811115610e6857600080fd5b860160a0818c037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0011215610e9d5760008081fd5b610ea5610105565b610eb08983016108dd565b815260408083015188811115610ec65760008081fd5b610ed48e8c83870101610b3a565b8b8401525060608084015189811115610eed5760008081fd5b610efb8f8d83880101610c8f565b8385015250608091508184015189811115610f165760008081fd5b610f248f8d83880101610d82565b918401919091525060a09290920151918101919091528352918601918601610e51565b5098975050505050505050565b80517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811681146108f557600080fd5b600082601f830112610f9157600080fd5b81516020610fa1610274836108b9565b82815260069290921b84018101918181019086841115610fc057600080fd5b8286015b84811015610b2f5760408189031215610fdd5760008081fd5b610fe5610151565b610fee826108dd565b8152610ffb858301610f54565b81860152835291830191604001610fc4565b600082601f83011261101e57600080fd5b8151602061102e610274836108b9565b82815260079290921b8401810191818101908684111561104d57600080fd5b8286015b84811015610b2f57808803608081121561106b5760008081fd5b611073610174565b61107c836108dd565b81526040807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0840112156110b05760008081fd5b6110b8610151565b92506110c58785016108dd565b83526110d28185016108dd565b8388015281870192909252606083015191810191909152835291830191608001611051565b6000602080838503121561110a57600080fd5b825167ffffffffffffffff8082111561112257600080fd5b8185019150604080838803121561113857600080fd5b611140610151565b83518381111561114f57600080fd5b84016040818a03121561116157600080fd5b611169610151565b81518581111561117857600080fd5b8201601f81018b1361118957600080fd5b8051611197610274826108b9565b81815260069190911b8201890190898101908d8311156111b657600080fd5b928a01925b828410156112045787848f0312156111d35760008081fd5b6111db610151565b6111e4856109b1565b81526111f18c8601610f54565b818d0152825292870192908a01906111bb565b84525050508187015193508484111561121c57600080fd5b6112288a858401610f80565b818801528252508385015191508282111561124257600080fd5b61124e8883860161100d565b8582015280955050505050509291505056fea164736f6c6343000818000a",
 }
 
 var ReportCodecABI = ReportCodecMetaData.ABI
@@ -529,7 +530,7 @@ func (ReportCodecCommitReportDecoded) Topic() common.Hash {
 }
 
 func (ReportCodecExecuteReportDecoded) Topic() common.Hash {
-	return common.HexToHash("0x7f4f1032eaaa1f5c3fc02d56071d69a09a2595d9a5fa4704f0eb298792908abb")
+	return common.HexToHash("0x70d042e9d8463eeac7e835e7172c08846ad327fc4eb6fc89f3bb5226e17ad618")
 }
 
 func (_ReportCodec *ReportCodec) Address() common.Address {
diff --git a/core/gethwrappers/ccip/generated/self_funded_ping_pong/self_funded_ping_pong.go b/core/gethwrappers/ccip/generated/self_funded_ping_pong/self_funded_ping_pong.go
index 755b4183fe..274f72bae3 100644
--- a/core/gethwrappers/ccip/generated/self_funded_ping_pong/self_funded_ping_pong.go
+++ b/core/gethwrappers/ccip/generated/self_funded_ping_pong/self_funded_ping_pong.go
@@ -45,7 +45,7 @@ type ClientEVMTokenAmount struct {
 
 var SelfFundedPingPongMetaData = &bind.MetaData{
 	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"router\",\"type\":\"address\"},{\"internalType\":\"contractIERC20\",\"name\":\"feeToken\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"roundTripsBeforeFunding\",\"type\":\"uint8\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"router\",\"type\":\"address\"}],\"name\":\"InvalidRouter\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"countIncrBeforeFunding\",\"type\":\"uint8\"}],\"name\":\"CountIncrBeforeFundingSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[],\"name\":\"Funded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"isOutOfOrder\",\"type\":\"bool\"}],\"name\":\"OutOfOrderExecutionChange\",\"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\":false,\"internalType\":\"uint256\",\"name\":\"pingPongCount\",\"type\":\"uint256\"}],\"name\":\"Ping\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"pingPongCount\",\"type\":\"uint256\"}],\"name\":\"Pong\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"messageId\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"sourceChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"sender\",\"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\":\"destTokenAmounts\",\"type\":\"tuple[]\"}],\"internalType\":\"structClient.Any2EVMMessage\",\"name\":\"message\",\"type\":\"tuple\"}],\"name\":\"ccipReceive\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"pingPongCount\",\"type\":\"uint256\"}],\"name\":\"fundPingPong\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getCountIncrBeforeFunding\",\"outputs\":[{\"internalType\":\"uint8\",\"name\":\"\",\"type\":\"uint8\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getCounterpartAddress\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getCounterpartChainSelector\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getFeeToken\",\"outputs\":[{\"internalType\":\"contractIERC20\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getOutOfOrderExecution\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getRouter\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"isPaused\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"countIncrBeforeFunding\",\"type\":\"uint8\"}],\"name\":\"setCountIncrBeforeFunding\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"counterpartChainSelector\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"counterpartAddress\",\"type\":\"address\"}],\"name\":\"setCounterpart\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"addr\",\"type\":\"address\"}],\"name\":\"setCounterpartAddress\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"chainSelector\",\"type\":\"uint64\"}],\"name\":\"setCounterpartChainSelector\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bool\",\"name\":\"outOfOrderExecution\",\"type\":\"bool\"}],\"name\":\"setOutOfOrderExecution\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bool\",\"name\":\"pause\",\"type\":\"bool\"}],\"name\":\"setPaused\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"startPingPong\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes4\",\"name\":\"interfaceId\",\"type\":\"bytes4\"}],\"name\":\"supportsInterface\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"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\"}]",
-	Bin: "0x60a06040523480156200001157600080fd5b506040516200190938038062001909833981016040819052620000349162000291565b828233806000846001600160a01b0381166200006b576040516335fdcccd60e21b8152600060048201526024015b60405180910390fd5b6001600160a01b039081166080528216620000c95760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f0000000000000000604482015260640162000062565b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000fc57620000fc81620001cd565b50506002805460ff60a01b1916905550600380546001600160a01b0319166001600160a01b0383811691821790925560405163095ea7b360e01b8152918416600483015260001960248301529063095ea7b3906044016020604051808303816000875af115801562000172573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001989190620002ea565b505050806002620001aa919062000315565b600360156101000a81548160ff021916908360ff16021790555050505062000347565b336001600160a01b03821603620002275760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000062565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b6001600160a01b03811681146200028e57600080fd5b50565b600080600060608486031215620002a757600080fd5b8351620002b48162000278565b6020850151909350620002c78162000278565b604085015190925060ff81168114620002df57600080fd5b809150509250925092565b600060208284031215620002fd57600080fd5b815180151581146200030e57600080fd5b9392505050565b60ff81811683821602908116908181146200034057634e487b7160e01b600052601160045260246000fd5b5092915050565b60805161159162000378600039600081816102f301528181610728015281816108180152610d0901526115916000f3fe608060405234801561001057600080fd5b50600436106101775760003560e01c80638f491cba116100d8578063b5a110111161008c578063e6c725f511610066578063e6c725f5146103a9578063ef686d8e146103da578063f2fde38b146103ed57600080fd5b8063b5a110111461033a578063bee518a41461034d578063ca709a251461038b57600080fd5b8063ae90de55116100bd578063ae90de55146102ce578063b0f479a1146102f1578063b187bd261461031757600080fd5b80638f491cba146102a85780639d2aede5146102bb57600080fd5b80632b6e5d631161012f57806379ba50971161011457806379ba50971461026f57806385572ffb146102775780638da5cb5b1461028a57600080fd5b80632b6e5d631461021d578063665ed5371461025c57600080fd5b8063181f5a7711610160578063181f5a77146101b95780631892b906146102025780632874d8bf1461021557600080fd5b806301ffc9a71461017c57806316c38b3c146101a4575b600080fd5b61018f61018a366004610f0b565b610400565b60405190151581526020015b60405180910390f35b6101b76101b2366004610f54565b610499565b005b6101f56040518060400160405280601881526020017f53656c6646756e64656450696e67506f6e6720312e322e30000000000000000081525081565b60405161019b9190610fda565b6101b761021036600461100a565b6104eb565b6101b7610546565b60025473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161019b565b6101b761026a366004610f54565b610582565b6101b761060e565b6101b7610285366004611025565b610710565b60005473ffffffffffffffffffffffffffffffffffffffff16610237565b6101b76102b6366004611060565b610795565b6101b76102c936600461109b565b610977565b60035474010000000000000000000000000000000000000000900460ff1661018f565b7f0000000000000000000000000000000000000000000000000000000000000000610237565b60025474010000000000000000000000000000000000000000900460ff1661018f565b6101b76103483660046110b8565b6109c6565b60015474010000000000000000000000000000000000000000900467ffffffffffffffff1660405167ffffffffffffffff909116815260200161019b565b60035473ffffffffffffffffffffffffffffffffffffffff16610237565b6003547501000000000000000000000000000000000000000000900460ff1660405160ff909116815260200161019b565b6101b76103e83660046110ef565b610a68565b6101b76103fb36600461109b565b610aeb565b60007fffffffff0000000000000000000000000000000000000000000000000000000082167f85572ffb00000000000000000000000000000000000000000000000000000000148061049357507fffffffff0000000000000000000000000000000000000000000000000000000082167f01ffc9a700000000000000000000000000000000000000000000000000000000145b92915050565b6104a1610afc565b6002805491151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff909216919091179055565b6104f3610afc565b6001805467ffffffffffffffff90921674010000000000000000000000000000000000000000027fffffffff0000000000000000ffffffffffffffffffffffffffffffffffffffff909216919091179055565b61054e610afc565b600280547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556105806001610b7d565b565b61058a610afc565b6003805482151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff9091161790556040517f05a3fef9935c9013a24c6193df2240d34fcf6b0ebf8786b85efe8401d696cdd99061060390831515815260200190565b60405180910390a150565b60015473ffffffffffffffffffffffffffffffffffffffff163314610694576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610781576040517fd7f7333400000000000000000000000000000000000000000000000000000000815233600482015260240161068b565b61079261078d82611317565b610dc0565b50565b6003547501000000000000000000000000000000000000000000900460ff1615806107dd57506003547501000000000000000000000000000000000000000000900460ff1681105b156107e55750565b600354600190610811907501000000000000000000000000000000000000000000900460ff16836113c4565b11610792577f00000000000000000000000000000000000000000000000000000000000000006001546040517fa8d87a3b0000000000000000000000000000000000000000000000000000000081527401000000000000000000000000000000000000000090910467ffffffffffffffff16600482015273ffffffffffffffffffffffffffffffffffffffff919091169063a8d87a3b90602401602060405180830381865afa1580156108c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ec91906113ff565b73ffffffffffffffffffffffffffffffffffffffff1663eff7cc486040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561093357600080fd5b505af1158015610947573d6000803e3d6000fd5b50506040517f302777af5d26fab9dd5120c5f1307c65193ebc51daf33244ada4365fab10602c925060009150a150565b61097f610afc565b600280547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff92909216919091179055565b6109ce610afc565b6001805467ffffffffffffffff90931674010000000000000000000000000000000000000000027fffffffff0000000000000000ffffffffffffffffffffffffffffffffffffffff909316929092179091556002805473ffffffffffffffffffffffffffffffffffffffff9092167fffffffffffffffffffffffff0000000000000000000000000000000000000000909216919091179055565b610a70610afc565b600380547fffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffffff16750100000000000000000000000000000000000000000060ff8416908102919091179091556040519081527f4768dbf8645b24c54f2887651545d24f748c0d0d1d4c689eb810fb19f0befcf390602001610603565b610af3610afc565b61079281610e16565b60005473ffffffffffffffffffffffffffffffffffffffff163314610580576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e657200000000000000000000604482015260640161068b565b80600116600103610bc0576040518181527f48257dc961b6f792c2b78a080dacfed693b660960a702de21cee364e20270e2f9060200160405180910390a1610bf4565b6040518181527f58b69f57828e6962d216502094c54f6562f3bf082ba758966c3454f9e37b15259060200160405180910390a15b610bfd81610795565b6040805160a0810190915260025473ffffffffffffffffffffffffffffffffffffffff1660c08201526000908060e08101604051602081830303815290604052815260200183604051602001610c5591815260200190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905281526020016000604051908082528060200260200182016040528015610ccf57816020015b6040805180820190915260008082526020820152815260200190600190039081610ca85790505b50815260035473ffffffffffffffffffffffffffffffffffffffff16602080830191909152604080519182018152600082529091015290507f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff166396f4e9f9600160149054906101000a900467ffffffffffffffff16836040518363ffffffff1660e01b8152600401610d7892919061141c565b6020604051808303816000875af1158015610d97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dbb9190611531565b505050565b60008160600151806020019051810190610dda9190611531565b60025490915074010000000000000000000000000000000000000000900460ff16610e1257610e12610e0d82600161154a565b610b7d565b5050565b3373ffffffffffffffffffffffffffffffffffffffff821603610e95576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640161068b565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b600060208284031215610f1d57600080fd5b81357fffffffff0000000000000000000000000000000000000000000000000000000081168114610f4d57600080fd5b9392505050565b600060208284031215610f6657600080fd5b81358015158114610f4d57600080fd5b6000815180845260005b81811015610f9c57602081850181015186830182015201610f80565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b602081526000610f4d6020830184610f76565b803567ffffffffffffffff8116811461100557600080fd5b919050565b60006020828403121561101c57600080fd5b610f4d82610fed565b60006020828403121561103757600080fd5b813567ffffffffffffffff81111561104e57600080fd5b820160a08185031215610f4d57600080fd5b60006020828403121561107257600080fd5b5035919050565b73ffffffffffffffffffffffffffffffffffffffff8116811461079257600080fd5b6000602082840312156110ad57600080fd5b8135610f4d81611079565b600080604083850312156110cb57600080fd5b6110d483610fed565b915060208301356110e481611079565b809150509250929050565b60006020828403121561110157600080fd5b813560ff81168114610f4d57600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff8111828210171561116457611164611112565b60405290565b60405160a0810167ffffffffffffffff8111828210171561116457611164611112565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156111d4576111d4611112565b604052919050565b600082601f8301126111ed57600080fd5b813567ffffffffffffffff81111561120757611207611112565b61123860207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8401160161118d565b81815284602083860101111561124d57600080fd5b816020850160208301376000918101602001919091529392505050565b600082601f83011261127b57600080fd5b8135602067ffffffffffffffff82111561129757611297611112565b6112a5818360051b0161118d565b82815260069290921b840181019181810190868411156112c457600080fd5b8286015b8481101561130c57604081890312156112e15760008081fd5b6112e9611141565b81356112f481611079565b815281850135858201528352918301916040016112c8565b509695505050505050565b600060a0823603121561132957600080fd5b61133161116a565b8235815261134160208401610fed565b6020820152604083013567ffffffffffffffff8082111561136157600080fd5b61136d368387016111dc565b6040840152606085013591508082111561138657600080fd5b611392368387016111dc565b606084015260808501359150808211156113ab57600080fd5b506113b83682860161126a565b60808301525092915050565b6000826113fa577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500690565b60006020828403121561141157600080fd5b8151610f4d81611079565b6000604067ffffffffffffffff851683526020604081850152845160a0604086015261144b60e0860182610f76565b9050818601517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0808784030160608801526114868383610f76565b6040890151888203830160808a01528051808352908601945060009350908501905b808410156114e7578451805173ffffffffffffffffffffffffffffffffffffffff168352860151868301529385019360019390930192908601906114a8565b50606089015173ffffffffffffffffffffffffffffffffffffffff1660a08901526080890151888203830160c08a015295506115238187610f76565b9a9950505050505050505050565b60006020828403121561154357600080fd5b5051919050565b80820180821115610493577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fdfea164736f6c6343000818000a",
+	Bin: "0x60a06040523480156200001157600080fd5b506040516200190938038062001909833981016040819052620000349162000291565b828233806000846001600160a01b0381166200006b576040516335fdcccd60e21b8152600060048201526024015b60405180910390fd5b6001600160a01b039081166080528216620000c95760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f0000000000000000604482015260640162000062565b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000fc57620000fc81620001cd565b50506002805460ff60a01b1916905550600380546001600160a01b0319166001600160a01b0383811691821790925560405163095ea7b360e01b8152918416600483015260001960248301529063095ea7b3906044016020604051808303816000875af115801562000172573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001989190620002ea565b505050806002620001aa919062000315565b600360156101000a81548160ff021916908360ff16021790555050505062000347565b336001600160a01b03821603620002275760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000062565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b6001600160a01b03811681146200028e57600080fd5b50565b600080600060608486031215620002a757600080fd5b8351620002b48162000278565b6020850151909350620002c78162000278565b604085015190925060ff81168114620002df57600080fd5b809150509250925092565b600060208284031215620002fd57600080fd5b815180151581146200030e57600080fd5b9392505050565b60ff81811683821602908116908181146200034057634e487b7160e01b600052601160045260246000fd5b5092915050565b60805161159162000378600039600081816102f301528181610728015281816108180152610d0901526115916000f3fe608060405234801561001057600080fd5b50600436106101775760003560e01c80638f491cba116100d8578063b5a110111161008c578063e6c725f511610066578063e6c725f5146103a9578063ef686d8e146103da578063f2fde38b146103ed57600080fd5b8063b5a110111461033a578063bee518a41461034d578063ca709a251461038b57600080fd5b8063ae90de55116100bd578063ae90de55146102ce578063b0f479a1146102f1578063b187bd261461031757600080fd5b80638f491cba146102a85780639d2aede5146102bb57600080fd5b80632b6e5d631161012f57806379ba50971161011457806379ba50971461026f57806385572ffb146102775780638da5cb5b1461028a57600080fd5b80632b6e5d631461021d578063665ed5371461025c57600080fd5b8063181f5a7711610160578063181f5a77146101b95780631892b906146102025780632874d8bf1461021557600080fd5b806301ffc9a71461017c57806316c38b3c146101a4575b600080fd5b61018f61018a366004610f0b565b610400565b60405190151581526020015b60405180910390f35b6101b76101b2366004610f54565b610499565b005b6101f56040518060400160405280601881526020017f53656c6646756e64656450696e67506f6e6720312e352e30000000000000000081525081565b60405161019b9190610fda565b6101b761021036600461100a565b6104eb565b6101b7610546565b60025473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161019b565b6101b761026a366004610f54565b610582565b6101b761060e565b6101b7610285366004611025565b610710565b60005473ffffffffffffffffffffffffffffffffffffffff16610237565b6101b76102b6366004611060565b610795565b6101b76102c936600461109b565b610977565b60035474010000000000000000000000000000000000000000900460ff1661018f565b7f0000000000000000000000000000000000000000000000000000000000000000610237565b60025474010000000000000000000000000000000000000000900460ff1661018f565b6101b76103483660046110b8565b6109c6565b60015474010000000000000000000000000000000000000000900467ffffffffffffffff1660405167ffffffffffffffff909116815260200161019b565b60035473ffffffffffffffffffffffffffffffffffffffff16610237565b6003547501000000000000000000000000000000000000000000900460ff1660405160ff909116815260200161019b565b6101b76103e83660046110ef565b610a68565b6101b76103fb36600461109b565b610aeb565b60007fffffffff0000000000000000000000000000000000000000000000000000000082167f85572ffb00000000000000000000000000000000000000000000000000000000148061049357507fffffffff0000000000000000000000000000000000000000000000000000000082167f01ffc9a700000000000000000000000000000000000000000000000000000000145b92915050565b6104a1610afc565b6002805491151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff909216919091179055565b6104f3610afc565b6001805467ffffffffffffffff90921674010000000000000000000000000000000000000000027fffffffff0000000000000000ffffffffffffffffffffffffffffffffffffffff909216919091179055565b61054e610afc565b600280547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556105806001610b7d565b565b61058a610afc565b6003805482151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff9091161790556040517f05a3fef9935c9013a24c6193df2240d34fcf6b0ebf8786b85efe8401d696cdd99061060390831515815260200190565b60405180910390a150565b60015473ffffffffffffffffffffffffffffffffffffffff163314610694576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610781576040517fd7f7333400000000000000000000000000000000000000000000000000000000815233600482015260240161068b565b61079261078d82611317565b610dc0565b50565b6003547501000000000000000000000000000000000000000000900460ff1615806107dd57506003547501000000000000000000000000000000000000000000900460ff1681105b156107e55750565b600354600190610811907501000000000000000000000000000000000000000000900460ff16836113c4565b11610792577f00000000000000000000000000000000000000000000000000000000000000006001546040517fa8d87a3b0000000000000000000000000000000000000000000000000000000081527401000000000000000000000000000000000000000090910467ffffffffffffffff16600482015273ffffffffffffffffffffffffffffffffffffffff919091169063a8d87a3b90602401602060405180830381865afa1580156108c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ec91906113ff565b73ffffffffffffffffffffffffffffffffffffffff1663eff7cc486040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561093357600080fd5b505af1158015610947573d6000803e3d6000fd5b50506040517f302777af5d26fab9dd5120c5f1307c65193ebc51daf33244ada4365fab10602c925060009150a150565b61097f610afc565b600280547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff92909216919091179055565b6109ce610afc565b6001805467ffffffffffffffff90931674010000000000000000000000000000000000000000027fffffffff0000000000000000ffffffffffffffffffffffffffffffffffffffff909316929092179091556002805473ffffffffffffffffffffffffffffffffffffffff9092167fffffffffffffffffffffffff0000000000000000000000000000000000000000909216919091179055565b610a70610afc565b600380547fffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffffff16750100000000000000000000000000000000000000000060ff8416908102919091179091556040519081527f4768dbf8645b24c54f2887651545d24f748c0d0d1d4c689eb810fb19f0befcf390602001610603565b610af3610afc565b61079281610e16565b60005473ffffffffffffffffffffffffffffffffffffffff163314610580576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e657200000000000000000000604482015260640161068b565b80600116600103610bc0576040518181527f48257dc961b6f792c2b78a080dacfed693b660960a702de21cee364e20270e2f9060200160405180910390a1610bf4565b6040518181527f58b69f57828e6962d216502094c54f6562f3bf082ba758966c3454f9e37b15259060200160405180910390a15b610bfd81610795565b6040805160a0810190915260025473ffffffffffffffffffffffffffffffffffffffff1660c08201526000908060e08101604051602081830303815290604052815260200183604051602001610c5591815260200190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905281526020016000604051908082528060200260200182016040528015610ccf57816020015b6040805180820190915260008082526020820152815260200190600190039081610ca85790505b50815260035473ffffffffffffffffffffffffffffffffffffffff16602080830191909152604080519182018152600082529091015290507f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff166396f4e9f9600160149054906101000a900467ffffffffffffffff16836040518363ffffffff1660e01b8152600401610d7892919061141c565b6020604051808303816000875af1158015610d97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dbb9190611531565b505050565b60008160600151806020019051810190610dda9190611531565b60025490915074010000000000000000000000000000000000000000900460ff16610e1257610e12610e0d82600161154a565b610b7d565b5050565b3373ffffffffffffffffffffffffffffffffffffffff821603610e95576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640161068b565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b600060208284031215610f1d57600080fd5b81357fffffffff0000000000000000000000000000000000000000000000000000000081168114610f4d57600080fd5b9392505050565b600060208284031215610f6657600080fd5b81358015158114610f4d57600080fd5b6000815180845260005b81811015610f9c57602081850181015186830182015201610f80565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b602081526000610f4d6020830184610f76565b803567ffffffffffffffff8116811461100557600080fd5b919050565b60006020828403121561101c57600080fd5b610f4d82610fed565b60006020828403121561103757600080fd5b813567ffffffffffffffff81111561104e57600080fd5b820160a08185031215610f4d57600080fd5b60006020828403121561107257600080fd5b5035919050565b73ffffffffffffffffffffffffffffffffffffffff8116811461079257600080fd5b6000602082840312156110ad57600080fd5b8135610f4d81611079565b600080604083850312156110cb57600080fd5b6110d483610fed565b915060208301356110e481611079565b809150509250929050565b60006020828403121561110157600080fd5b813560ff81168114610f4d57600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff8111828210171561116457611164611112565b60405290565b60405160a0810167ffffffffffffffff8111828210171561116457611164611112565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156111d4576111d4611112565b604052919050565b600082601f8301126111ed57600080fd5b813567ffffffffffffffff81111561120757611207611112565b61123860207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8401160161118d565b81815284602083860101111561124d57600080fd5b816020850160208301376000918101602001919091529392505050565b600082601f83011261127b57600080fd5b8135602067ffffffffffffffff82111561129757611297611112565b6112a5818360051b0161118d565b82815260069290921b840181019181810190868411156112c457600080fd5b8286015b8481101561130c57604081890312156112e15760008081fd5b6112e9611141565b81356112f481611079565b815281850135858201528352918301916040016112c8565b509695505050505050565b600060a0823603121561132957600080fd5b61133161116a565b8235815261134160208401610fed565b6020820152604083013567ffffffffffffffff8082111561136157600080fd5b61136d368387016111dc565b6040840152606085013591508082111561138657600080fd5b611392368387016111dc565b606084015260808501359150808211156113ab57600080fd5b506113b83682860161126a565b60808301525092915050565b6000826113fa577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500690565b60006020828403121561141157600080fd5b8151610f4d81611079565b6000604067ffffffffffffffff851683526020604081850152845160a0604086015261144b60e0860182610f76565b9050818601517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0808784030160608801526114868383610f76565b6040890151888203830160808a01528051808352908601945060009350908501905b808410156114e7578451805173ffffffffffffffffffffffffffffffffffffffff168352860151868301529385019360019390930192908601906114a8565b50606089015173ffffffffffffffffffffffffffffffffffffffff1660a08901526080890151888203830160c08a015295506115238187610f76565b9a9950505050505050505050565b60006020828403121561154357600080fd5b5051919050565b80820180821115610493577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fdfea164736f6c6343000818000a",
 }
 
 var SelfFundedPingPongABI = SelfFundedPingPongMetaData.ABI
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 5c3a85cb32..afbdd51c79 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,33 +5,34 @@ burn_mint_token_pool_and_proxy: ../../../contracts/solc/v0.8.24/BurnMintTokenPoo
 burn_with_from_mint_token_pool: ../../../contracts/solc/v0.8.24/BurnWithFromMintTokenPool/BurnWithFromMintTokenPool.abi ../../../contracts/solc/v0.8.24/BurnWithFromMintTokenPool/BurnWithFromMintTokenPool.bin 6333d0314d0bd29e75ea5e05fe62a4516ade0c6db91c30b6f93645035db52ed8
 burn_with_from_mint_token_pool_and_proxy: ../../../contracts/solc/v0.8.24/BurnWithFromMintTokenPoolAndProxy/BurnWithFromMintTokenPoolAndProxy.abi ../../../contracts/solc/v0.8.24/BurnWithFromMintTokenPoolAndProxy/BurnWithFromMintTokenPoolAndProxy.bin 08ed1235dda921ce8841b26aa18d0c0f36db4884779dd7670857159801b6d597
 ccip_config: ../../../contracts/solc/v0.8.24/CCIPConfig/CCIPConfig.abi ../../../contracts/solc/v0.8.24/CCIPConfig/CCIPConfig.bin 213d4adc8634671aea16fb4207989375b1aac919b04d608f4767c29592affbf5
-ccip_reader_tester: ../../../contracts/solc/v0.8.24/CCIPReaderTester/CCIPReaderTester.abi ../../../contracts/solc/v0.8.24/CCIPReaderTester/CCIPReaderTester.bin a5b0275dcf502f73d72f6bc53bff774e25fcca01a74cc019536bdee6a42ac655
+ccip_reader_tester: ../../../contracts/solc/v0.8.24/CCIPReaderTester/CCIPReaderTester.abi ../../../contracts/solc/v0.8.24/CCIPReaderTester/CCIPReaderTester.bin d8d70fe111bacc7702c7c263f8c4733dcb2fff77e52c9f60c30d303731bc97c1
 commit_store: ../../../contracts/solc/v0.8.24/CommitStore/CommitStore.abi ../../../contracts/solc/v0.8.24/CommitStore/CommitStore.bin 274d87db70b643e00ab0a7e7845bb4b791f3b613bfc87708d33fc5a8369e2a41
 commit_store_helper: ../../../contracts/solc/v0.8.24/CommitStoreHelper/CommitStoreHelper.abi ../../../contracts/solc/v0.8.24/CommitStoreHelper/CommitStoreHelper.bin f7128dcc2ee6dbcbc976288abcc16970ffb19b59412c5202ef6b259d2007f801
 ether_sender_receiver: ../../../contracts/solc/v0.8.24/EtherSenderReceiver/EtherSenderReceiver.abi ../../../contracts/solc/v0.8.24/EtherSenderReceiver/EtherSenderReceiver.bin 09510a3f773f108a3c231e8d202835c845ded862d071ec54c4f89c12d868b8de
 evm_2_evm_offramp: ../../../contracts/solc/v0.8.24/EVM2EVMOffRamp/EVM2EVMOffRamp.abi ../../../contracts/solc/v0.8.24/EVM2EVMOffRamp/EVM2EVMOffRamp.bin b0d77babbe635cd6ba04c2af049badc9e9d28a4b6ed6bb75f830ad902a618beb
 evm_2_evm_onramp: ../../../contracts/solc/v0.8.24/EVM2EVMOnRamp/EVM2EVMOnRamp.abi ../../../contracts/solc/v0.8.24/EVM2EVMOnRamp/EVM2EVMOnRamp.bin 5c02c2b167946b3467636ff2bb58594cb4652fc63d8bdfee2488ed562e2a3e50
+fee_quoter: ../../../contracts/solc/v0.8.24/FeeQuoter/FeeQuoter.abi ../../../contracts/solc/v0.8.24/FeeQuoter/FeeQuoter.bin 920b7a293165fe8306fbed0cafd866bafc5943e8759486f7803bfbbd40309b6b
 lock_release_token_pool: ../../../contracts/solc/v0.8.24/LockReleaseTokenPool/LockReleaseTokenPool.abi ../../../contracts/solc/v0.8.24/LockReleaseTokenPool/LockReleaseTokenPool.bin e6a8ec9e8faccb1da7d90e0f702ed72975964f97dc3222b54cfcca0a0ba3fea2
 lock_release_token_pool_and_proxy: ../../../contracts/solc/v0.8.24/LockReleaseTokenPoolAndProxy/LockReleaseTokenPoolAndProxy.abi ../../../contracts/solc/v0.8.24/LockReleaseTokenPoolAndProxy/LockReleaseTokenPoolAndProxy.bin e632b08be0fbd1d013e8b3a9d75293d0d532b83071c531ff2be1deec1fa48ec1
 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 1d5146d43e1b99cd2d6f9f06475be19087e4349f7cee0fdbbf134ba65e967c93
+message_hasher: ../../../contracts/solc/v0.8.24/MessageHasher/MessageHasher.abi ../../../contracts/solc/v0.8.24/MessageHasher/MessageHasher.bin 5712fbc30cf826c0cf38c68f54f744741b553d98c60e66696b7a845778cb2b3d
 mock_usdc_token_messenger: ../../../contracts/solc/v0.8.24/MockE2EUSDCTokenMessenger/MockE2EUSDCTokenMessenger.abi ../../../contracts/solc/v0.8.24/MockE2EUSDCTokenMessenger/MockE2EUSDCTokenMessenger.bin d976651d36b33ac2196b32b9d2f4fa6690c6a18d41b621365659fce1c1d1e737
 mock_usdc_token_transmitter: ../../../contracts/solc/v0.8.24/MockE2EUSDCTransmitter/MockE2EUSDCTransmitter.abi ../../../contracts/solc/v0.8.24/MockE2EUSDCTransmitter/MockE2EUSDCTransmitter.bin be0dbc3e475741ea0b7a54ec2b935a321b428baa9f4ce18180a87fb38bb87de2
 mock_v3_aggregator_contract: ../../../contracts/solc/v0.8.24/MockV3Aggregator/MockV3Aggregator.abi ../../../contracts/solc/v0.8.24/MockV3Aggregator/MockV3Aggregator.bin 518e19efa2ff52b0fefd8e597b05765317ee7638189bfe34ca43de2f6599faf4
-multi_aggregate_rate_limiter: ../../../contracts/solc/v0.8.24/MultiAggregateRateLimiter/MultiAggregateRateLimiter.abi ../../../contracts/solc/v0.8.24/MultiAggregateRateLimiter/MultiAggregateRateLimiter.bin 51435ef057455bea49888b81b06ed92f6b82c58f59e3575e4c60833031e23750
+multi_aggregate_rate_limiter: ../../../contracts/solc/v0.8.24/MultiAggregateRateLimiter/MultiAggregateRateLimiter.abi ../../../contracts/solc/v0.8.24/MultiAggregateRateLimiter/MultiAggregateRateLimiter.bin 0b541232e49727e947dc164eadf35963c66e67576f21baa0ecaa06a8833148ed
 multi_ocr3_helper: ../../../contracts/solc/v0.8.24/MultiOCR3Helper/MultiOCR3Helper.abi ../../../contracts/solc/v0.8.24/MultiOCR3Helper/MultiOCR3Helper.bin aa299e0c2659d53aad4eace4d66be0e734b1366008593669cf30361ff529da6a
 nonce_manager: ../../../contracts/solc/v0.8.24/NonceManager/NonceManager.abi ../../../contracts/solc/v0.8.24/NonceManager/NonceManager.bin 6f64e1083b356c06ee66b9138e398b9c97a4cd3e8c9ec38cf3010cebc79af536
 ocr3_config_encoder: ../../../contracts/solc/v0.8.24/IOCR3ConfigEncoder/IOCR3ConfigEncoder.abi ../../../contracts/solc/v0.8.24/IOCR3ConfigEncoder/IOCR3ConfigEncoder.bin e21180898e1ad54a045ee20add85a2793c681425ea06f66d1a9e5cab128b6487
-offramp: ../../../contracts/solc/v0.8.24/OffRamp/OffRamp.abi ../../../contracts/solc/v0.8.24/OffRamp/OffRamp.bin 76ec9676116368ab7c7c7ed45191698a12e4d975633caea32d821a1125633589
-onramp: ../../../contracts/solc/v0.8.24/OnRamp/OnRamp.abi ../../../contracts/solc/v0.8.24/OnRamp/OnRamp.bin 123e949bc9607289382534c4432ecebe5b1da5ca92c1c6c8cc6b9be56c3352c6
-ping_pong_demo: ../../../contracts/solc/v0.8.24/PingPongDemo/PingPongDemo.abi ../../../contracts/solc/v0.8.24/PingPongDemo/PingPongDemo.bin 4e51d70bdb6d951041518a3d7fd3b33ba8d3954bcc3d078318055b833b880324
-price_registry: ../../../contracts/solc/v0.8.24/PriceRegistry/PriceRegistry.abi ../../../contracts/solc/v0.8.24/PriceRegistry/PriceRegistry.bin 8931609776700a2a8121c9fdd757dbf9207d8b97583e70c84ec2d88c839d4a30
+offramp: ../../../contracts/solc/v0.8.24/OffRamp/OffRamp.abi ../../../contracts/solc/v0.8.24/OffRamp/OffRamp.bin a3b8a9644f0d450dbf53d3371555dcc4084fb2eaf138a3797ef5cf73ed665bae
+onramp: ../../../contracts/solc/v0.8.24/OnRamp/OnRamp.abi ../../../contracts/solc/v0.8.24/OnRamp/OnRamp.bin 1ae9e3ebefc56d0382308c67c4ec066cdf3fa3eed2d31af8015d5d8db67f9c90
+ping_pong_demo: ../../../contracts/solc/v0.8.24/PingPongDemo/PingPongDemo.abi ../../../contracts/solc/v0.8.24/PingPongDemo/PingPongDemo.bin c1c2f8a65c7ffd971899cae7fe62f2da57d09e936151e2b92163c4bebe699d6b
+price_registry: ../../../contracts/solc/v0.8.24/PriceRegistry/PriceRegistry.abi ../../../contracts/solc/v0.8.24/PriceRegistry/PriceRegistry.bin e7781d600c1bb7aa4620106af7f6e146a109b97f4cb6a7d06c9e15773340ecb2
 registry_module_owner_custom: ../../../contracts/solc/v0.8.24/RegistryModuleOwnerCustom/RegistryModuleOwnerCustom.abi ../../../contracts/solc/v0.8.24/RegistryModuleOwnerCustom/RegistryModuleOwnerCustom.bin 75be86323c227917a9bbc3f799d7ed02f92db546653a36db30ed0ebe64461353
-report_codec: ../../../contracts/solc/v0.8.24/ReportCodec/ReportCodec.abi ../../../contracts/solc/v0.8.24/ReportCodec/ReportCodec.bin 20292ddaba15096fe8060567cf56cda673b947df27241d0c49d2debc838feb24
+report_codec: ../../../contracts/solc/v0.8.24/ReportCodec/ReportCodec.abi ../../../contracts/solc/v0.8.24/ReportCodec/ReportCodec.bin 3d7ebd8d4563b63cec83b141fe9f9ef5d8ab12a7c23ccd5e7e3434aba3cab66a
 rmn_contract: ../../../contracts/solc/v0.8.24/RMN/RMN.abi ../../../contracts/solc/v0.8.24/RMN/RMN.bin 8b45b0fb08631c6b582fd3c0b4052a79cc2b4e091e6286af1ab131bef63661f9
 rmn_proxy_contract: ../../../contracts/solc/v0.8.24/ARMProxy/ARMProxy.abi ../../../contracts/solc/v0.8.24/ARMProxy/ARMProxy.bin b048d8e752e3c41113ebb305c1efa06737ad36b4907b93e627fb0a3113023454
 router: ../../../contracts/solc/v0.8.24/Router/Router.abi ../../../contracts/solc/v0.8.24/Router/Router.bin 2e4f0a7826c8abb49d882bb49fc5ff20a186dbd3137624b9097ffed903ae4888
-self_funded_ping_pong: ../../../contracts/solc/v0.8.24/SelfFundedPingPong/SelfFundedPingPong.abi ../../../contracts/solc/v0.8.24/SelfFundedPingPong/SelfFundedPingPong.bin 4f339db2b670b88214b738efb7a714be9d50fa32c8008710b607d58670b22074
+self_funded_ping_pong: ../../../contracts/solc/v0.8.24/SelfFundedPingPong/SelfFundedPingPong.abi ../../../contracts/solc/v0.8.24/SelfFundedPingPong/SelfFundedPingPong.bin 8ea5d75dbc3f8afd90d22c4a665a94e02892259cd16520c1c6b4cf0dc80c9148
 token_admin_registry: ../../../contracts/solc/v0.8.24/TokenAdminRegistry/TokenAdminRegistry.abi ../../../contracts/solc/v0.8.24/TokenAdminRegistry/TokenAdminRegistry.bin 942be7d1681ac102e0615bee13f76838ebb0b261697cf1270d2bf82c12e57aeb
 token_pool: ../../../contracts/solc/v0.8.24/TokenPool/TokenPool.abi ../../../contracts/solc/v0.8.24/TokenPool/TokenPool.bin 7c01fd89f5153baa4d7409d14beabb3f861abfbf8880d3c6d06802cc398570f9
 usdc_token_pool: ../../../contracts/solc/v0.8.24/USDCTokenPool/USDCTokenPool.abi ../../../contracts/solc/v0.8.24/USDCTokenPool/USDCTokenPool.bin 8e7eae4c7277ce4a0092cca815c046cc49094028c23d2d113de9335fa4358030
diff --git a/core/gethwrappers/ccip/go_generate.go b/core/gethwrappers/ccip/go_generate.go
index a41b01c7ab..5c316af1ac 100644
--- a/core/gethwrappers/ccip/go_generate.go
+++ b/core/gethwrappers/ccip/go_generate.go
@@ -14,7 +14,7 @@ package ccip
 //go:generate go run ../generation/generate/wrap.go ../../../contracts/solc/v0.8.24/OffRamp/OffRamp.abi ../../../contracts/solc/v0.8.24/OffRamp/OffRamp.bin OffRamp offramp
 //go:generate go run ../generation/generate/wrap.go ../../../contracts/solc/v0.8.24/MultiAggregateRateLimiter/MultiAggregateRateLimiter.abi ../../../contracts/solc/v0.8.24/MultiAggregateRateLimiter/MultiAggregateRateLimiter.bin MultiAggregateRateLimiter multi_aggregate_rate_limiter
 //go:generate go run ../generation/generate/wrap.go ../../../contracts/solc/v0.8.24/Router/Router.abi ../../../contracts/solc/v0.8.24/Router/Router.bin Router router
-//go:generate go run ../generation/generate/wrap.go ../../../contracts/solc/v0.8.24/PriceRegistry/PriceRegistry.abi ../../../contracts/solc/v0.8.24/PriceRegistry/PriceRegistry.bin PriceRegistry price_registry
+//go:generate go run ../generation/generate/wrap.go ../../../contracts/solc/v0.8.24/FeeQuoter/FeeQuoter.abi ../../../contracts/solc/v0.8.24/FeeQuoter/FeeQuoter.bin FeeQuoter fee_quoter
 //go:generate go run ../generation/generate/wrap.go ../../../contracts/solc/v0.8.24/CCIPConfig/CCIPConfig.abi ../../../contracts/solc/v0.8.24/CCIPConfig/CCIPConfig.bin CCIPConfig ccip_config
 //go:generate go run ../generation/generate/wrap.go ../../../contracts/solc/v0.8.24/NonceManager/NonceManager.abi ../../../contracts/solc/v0.8.24/NonceManager/NonceManager.bin NonceManager nonce_manager
 
diff --git a/core/gethwrappers/ccip/mocks/fee_quoter_interface.go b/core/gethwrappers/ccip/mocks/fee_quoter_interface.go
new file mode 100644
index 0000000000..27f53c0bd9
--- /dev/null
+++ b/core/gethwrappers/ccip/mocks/fee_quoter_interface.go
@@ -0,0 +1,4509 @@
+// Code generated by mockery v2.43.2. DO NOT EDIT.
+
+package mock_contracts
+
+import (
+	big "math/big"
+
+	bind "github.com/ethereum/go-ethereum/accounts/abi/bind"
+	common "github.com/ethereum/go-ethereum/common"
+
+	event "github.com/ethereum/go-ethereum/event"
+
+	fee_quoter "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"
+
+	generated "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
+
+	mock "github.com/stretchr/testify/mock"
+
+	types "github.com/ethereum/go-ethereum/core/types"
+)
+
+// FeeQuoterInterface is an autogenerated mock type for the FeeQuoterInterface type
+type FeeQuoterInterface struct {
+	mock.Mock
+}
+
+type FeeQuoterInterface_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *FeeQuoterInterface) EXPECT() *FeeQuoterInterface_Expecter {
+	return &FeeQuoterInterface_Expecter{mock: &_m.Mock}
+}
+
+// AcceptOwnership provides a mock function with given fields: opts
+func (_m *FeeQuoterInterface) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
+	ret := _m.Called(opts)
+
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
+		return rf(opts)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) *types.Transaction); ok {
+		r0 = rf(opts)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts) error); ok {
+		r1 = rf(opts)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_AcceptOwnership_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'AcceptOwnership'
+type FeeQuoterInterface_AcceptOwnership_Call struct {
+	*mock.Call
+}
+
+// AcceptOwnership is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+func (_e *FeeQuoterInterface_Expecter) AcceptOwnership(opts interface{}) *FeeQuoterInterface_AcceptOwnership_Call {
+	return &FeeQuoterInterface_AcceptOwnership_Call{Call: _e.mock.On("AcceptOwnership", opts)}
+}
+
+func (_c *FeeQuoterInterface_AcceptOwnership_Call) Run(run func(opts *bind.TransactOpts)) *FeeQuoterInterface_AcceptOwnership_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_AcceptOwnership_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_AcceptOwnership_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_AcceptOwnership_Call) RunAndReturn(run func(*bind.TransactOpts) (*types.Transaction, error)) *FeeQuoterInterface_AcceptOwnership_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Address provides a mock function with given fields:
+func (_m *FeeQuoterInterface) Address() common.Address {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
+	var r0 common.Address
+	if rf, ok := ret.Get(0).(func() common.Address); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(common.Address)
+		}
+	}
+
+	return r0
+}
+
+// FeeQuoterInterface_Address_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Address'
+type FeeQuoterInterface_Address_Call struct {
+	*mock.Call
+}
+
+// Address is a helper method to define mock.On call
+func (_e *FeeQuoterInterface_Expecter) Address() *FeeQuoterInterface_Address_Call {
+	return &FeeQuoterInterface_Address_Call{Call: _e.mock.On("Address")}
+}
+
+func (_c *FeeQuoterInterface_Address_Call) Run(run func()) *FeeQuoterInterface_Address_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_Address_Call) Return(_a0 common.Address) *FeeQuoterInterface_Address_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_Address_Call) RunAndReturn(run func() common.Address) *FeeQuoterInterface_Address_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ApplyAuthorizedCallerUpdates provides a mock function with given fields: opts, authorizedCallerArgs
+func (_m *FeeQuoterInterface) ApplyAuthorizedCallerUpdates(opts *bind.TransactOpts, authorizedCallerArgs fee_quoter.AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error) {
+	ret := _m.Called(opts, authorizedCallerArgs)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ApplyAuthorizedCallerUpdates")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, fee_quoter.AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error)); ok {
+		return rf(opts, authorizedCallerArgs)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, fee_quoter.AuthorizedCallersAuthorizedCallerArgs) *types.Transaction); ok {
+		r0 = rf(opts, authorizedCallerArgs)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, fee_quoter.AuthorizedCallersAuthorizedCallerArgs) error); ok {
+		r1 = rf(opts, authorizedCallerArgs)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ApplyAuthorizedCallerUpdates_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyAuthorizedCallerUpdates'
+type FeeQuoterInterface_ApplyAuthorizedCallerUpdates_Call struct {
+	*mock.Call
+}
+
+// ApplyAuthorizedCallerUpdates is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+//   - authorizedCallerArgs fee_quoter.AuthorizedCallersAuthorizedCallerArgs
+func (_e *FeeQuoterInterface_Expecter) ApplyAuthorizedCallerUpdates(opts interface{}, authorizedCallerArgs interface{}) *FeeQuoterInterface_ApplyAuthorizedCallerUpdates_Call {
+	return &FeeQuoterInterface_ApplyAuthorizedCallerUpdates_Call{Call: _e.mock.On("ApplyAuthorizedCallerUpdates", opts, authorizedCallerArgs)}
+}
+
+func (_c *FeeQuoterInterface_ApplyAuthorizedCallerUpdates_Call) Run(run func(opts *bind.TransactOpts, authorizedCallerArgs fee_quoter.AuthorizedCallersAuthorizedCallerArgs)) *FeeQuoterInterface_ApplyAuthorizedCallerUpdates_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts), args[1].(fee_quoter.AuthorizedCallersAuthorizedCallerArgs))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ApplyAuthorizedCallerUpdates_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_ApplyAuthorizedCallerUpdates_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ApplyAuthorizedCallerUpdates_Call) RunAndReturn(run func(*bind.TransactOpts, fee_quoter.AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error)) *FeeQuoterInterface_ApplyAuthorizedCallerUpdates_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ApplyDestChainConfigUpdates provides a mock function with given fields: opts, destChainConfigArgs
+func (_m *FeeQuoterInterface) ApplyDestChainConfigUpdates(opts *bind.TransactOpts, destChainConfigArgs []fee_quoter.FeeQuoterDestChainConfigArgs) (*types.Transaction, error) {
+	ret := _m.Called(opts, destChainConfigArgs)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ApplyDestChainConfigUpdates")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterDestChainConfigArgs) (*types.Transaction, error)); ok {
+		return rf(opts, destChainConfigArgs)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterDestChainConfigArgs) *types.Transaction); ok {
+		r0 = rf(opts, destChainConfigArgs)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterDestChainConfigArgs) error); ok {
+		r1 = rf(opts, destChainConfigArgs)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ApplyDestChainConfigUpdates_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyDestChainConfigUpdates'
+type FeeQuoterInterface_ApplyDestChainConfigUpdates_Call struct {
+	*mock.Call
+}
+
+// ApplyDestChainConfigUpdates is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+//   - destChainConfigArgs []fee_quoter.FeeQuoterDestChainConfigArgs
+func (_e *FeeQuoterInterface_Expecter) ApplyDestChainConfigUpdates(opts interface{}, destChainConfigArgs interface{}) *FeeQuoterInterface_ApplyDestChainConfigUpdates_Call {
+	return &FeeQuoterInterface_ApplyDestChainConfigUpdates_Call{Call: _e.mock.On("ApplyDestChainConfigUpdates", opts, destChainConfigArgs)}
+}
+
+func (_c *FeeQuoterInterface_ApplyDestChainConfigUpdates_Call) Run(run func(opts *bind.TransactOpts, destChainConfigArgs []fee_quoter.FeeQuoterDestChainConfigArgs)) *FeeQuoterInterface_ApplyDestChainConfigUpdates_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts), args[1].([]fee_quoter.FeeQuoterDestChainConfigArgs))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ApplyDestChainConfigUpdates_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_ApplyDestChainConfigUpdates_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ApplyDestChainConfigUpdates_Call) RunAndReturn(run func(*bind.TransactOpts, []fee_quoter.FeeQuoterDestChainConfigArgs) (*types.Transaction, error)) *FeeQuoterInterface_ApplyDestChainConfigUpdates_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ApplyFeeTokensUpdates provides a mock function with given fields: opts, feeTokensToAdd, feeTokensToRemove
+func (_m *FeeQuoterInterface) ApplyFeeTokensUpdates(opts *bind.TransactOpts, feeTokensToAdd []common.Address, feeTokensToRemove []common.Address) (*types.Transaction, error) {
+	ret := _m.Called(opts, feeTokensToAdd, feeTokensToRemove)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ApplyFeeTokensUpdates")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []common.Address) (*types.Transaction, error)); ok {
+		return rf(opts, feeTokensToAdd, feeTokensToRemove)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []common.Address) *types.Transaction); ok {
+		r0 = rf(opts, feeTokensToAdd, feeTokensToRemove)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []common.Address, []common.Address) error); ok {
+		r1 = rf(opts, feeTokensToAdd, feeTokensToRemove)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ApplyFeeTokensUpdates_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyFeeTokensUpdates'
+type FeeQuoterInterface_ApplyFeeTokensUpdates_Call struct {
+	*mock.Call
+}
+
+// ApplyFeeTokensUpdates is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+//   - feeTokensToAdd []common.Address
+//   - feeTokensToRemove []common.Address
+func (_e *FeeQuoterInterface_Expecter) ApplyFeeTokensUpdates(opts interface{}, feeTokensToAdd interface{}, feeTokensToRemove interface{}) *FeeQuoterInterface_ApplyFeeTokensUpdates_Call {
+	return &FeeQuoterInterface_ApplyFeeTokensUpdates_Call{Call: _e.mock.On("ApplyFeeTokensUpdates", opts, feeTokensToAdd, feeTokensToRemove)}
+}
+
+func (_c *FeeQuoterInterface_ApplyFeeTokensUpdates_Call) Run(run func(opts *bind.TransactOpts, feeTokensToAdd []common.Address, feeTokensToRemove []common.Address)) *FeeQuoterInterface_ApplyFeeTokensUpdates_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts), args[1].([]common.Address), args[2].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ApplyFeeTokensUpdates_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_ApplyFeeTokensUpdates_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ApplyFeeTokensUpdates_Call) RunAndReturn(run func(*bind.TransactOpts, []common.Address, []common.Address) (*types.Transaction, error)) *FeeQuoterInterface_ApplyFeeTokensUpdates_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ApplyPremiumMultiplierWeiPerEthUpdates provides a mock function with given fields: opts, premiumMultiplierWeiPerEthArgs
+func (_m *FeeQuoterInterface) ApplyPremiumMultiplierWeiPerEthUpdates(opts *bind.TransactOpts, premiumMultiplierWeiPerEthArgs []fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error) {
+	ret := _m.Called(opts, premiumMultiplierWeiPerEthArgs)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ApplyPremiumMultiplierWeiPerEthUpdates")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error)); ok {
+		return rf(opts, premiumMultiplierWeiPerEthArgs)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs) *types.Transaction); ok {
+		r0 = rf(opts, premiumMultiplierWeiPerEthArgs)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs) error); ok {
+		r1 = rf(opts, premiumMultiplierWeiPerEthArgs)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyPremiumMultiplierWeiPerEthUpdates'
+type FeeQuoterInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call struct {
+	*mock.Call
+}
+
+// ApplyPremiumMultiplierWeiPerEthUpdates is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+//   - premiumMultiplierWeiPerEthArgs []fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs
+func (_e *FeeQuoterInterface_Expecter) ApplyPremiumMultiplierWeiPerEthUpdates(opts interface{}, premiumMultiplierWeiPerEthArgs interface{}) *FeeQuoterInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call {
+	return &FeeQuoterInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call{Call: _e.mock.On("ApplyPremiumMultiplierWeiPerEthUpdates", opts, premiumMultiplierWeiPerEthArgs)}
+}
+
+func (_c *FeeQuoterInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call) Run(run func(opts *bind.TransactOpts, premiumMultiplierWeiPerEthArgs []fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs)) *FeeQuoterInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts), args[1].([]fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call) RunAndReturn(run func(*bind.TransactOpts, []fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error)) *FeeQuoterInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ApplyTokenTransferFeeConfigUpdates provides a mock function with given fields: opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs
+func (_m *FeeQuoterInterface) ApplyTokenTransferFeeConfigUpdates(opts *bind.TransactOpts, tokenTransferFeeConfigArgs []fee_quoter.FeeQuoterTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []fee_quoter.FeeQuoterTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error) {
+	ret := _m.Called(opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ApplyTokenTransferFeeConfigUpdates")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterTokenTransferFeeConfigArgs, []fee_quoter.FeeQuoterTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error)); ok {
+		return rf(opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterTokenTransferFeeConfigArgs, []fee_quoter.FeeQuoterTokenTransferFeeConfigRemoveArgs) *types.Transaction); ok {
+		r0 = rf(opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterTokenTransferFeeConfigArgs, []fee_quoter.FeeQuoterTokenTransferFeeConfigRemoveArgs) error); ok {
+		r1 = rf(opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ApplyTokenTransferFeeConfigUpdates_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyTokenTransferFeeConfigUpdates'
+type FeeQuoterInterface_ApplyTokenTransferFeeConfigUpdates_Call struct {
+	*mock.Call
+}
+
+// ApplyTokenTransferFeeConfigUpdates is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+//   - tokenTransferFeeConfigArgs []fee_quoter.FeeQuoterTokenTransferFeeConfigArgs
+//   - tokensToUseDefaultFeeConfigs []fee_quoter.FeeQuoterTokenTransferFeeConfigRemoveArgs
+func (_e *FeeQuoterInterface_Expecter) ApplyTokenTransferFeeConfigUpdates(opts interface{}, tokenTransferFeeConfigArgs interface{}, tokensToUseDefaultFeeConfigs interface{}) *FeeQuoterInterface_ApplyTokenTransferFeeConfigUpdates_Call {
+	return &FeeQuoterInterface_ApplyTokenTransferFeeConfigUpdates_Call{Call: _e.mock.On("ApplyTokenTransferFeeConfigUpdates", opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)}
+}
+
+func (_c *FeeQuoterInterface_ApplyTokenTransferFeeConfigUpdates_Call) Run(run func(opts *bind.TransactOpts, tokenTransferFeeConfigArgs []fee_quoter.FeeQuoterTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []fee_quoter.FeeQuoterTokenTransferFeeConfigRemoveArgs)) *FeeQuoterInterface_ApplyTokenTransferFeeConfigUpdates_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts), args[1].([]fee_quoter.FeeQuoterTokenTransferFeeConfigArgs), args[2].([]fee_quoter.FeeQuoterTokenTransferFeeConfigRemoveArgs))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ApplyTokenTransferFeeConfigUpdates_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_ApplyTokenTransferFeeConfigUpdates_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ApplyTokenTransferFeeConfigUpdates_Call) RunAndReturn(run func(*bind.TransactOpts, []fee_quoter.FeeQuoterTokenTransferFeeConfigArgs, []fee_quoter.FeeQuoterTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error)) *FeeQuoterInterface_ApplyTokenTransferFeeConfigUpdates_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ConvertTokenAmount provides a mock function with given fields: opts, fromToken, fromTokenAmount, toToken
+func (_m *FeeQuoterInterface) ConvertTokenAmount(opts *bind.CallOpts, fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address) (*big.Int, error) {
+	ret := _m.Called(opts, fromToken, fromTokenAmount, toToken)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ConvertTokenAmount")
+	}
+
+	var r0 *big.Int
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, *big.Int, common.Address) (*big.Int, error)); ok {
+		return rf(opts, fromToken, fromTokenAmount, toToken)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, *big.Int, common.Address) *big.Int); ok {
+		r0 = rf(opts, fromToken, fromTokenAmount, toToken)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*big.Int)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address, *big.Int, common.Address) error); ok {
+		r1 = rf(opts, fromToken, fromTokenAmount, toToken)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ConvertTokenAmount_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ConvertTokenAmount'
+type FeeQuoterInterface_ConvertTokenAmount_Call struct {
+	*mock.Call
+}
+
+// ConvertTokenAmount is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - fromToken common.Address
+//   - fromTokenAmount *big.Int
+//   - toToken common.Address
+func (_e *FeeQuoterInterface_Expecter) ConvertTokenAmount(opts interface{}, fromToken interface{}, fromTokenAmount interface{}, toToken interface{}) *FeeQuoterInterface_ConvertTokenAmount_Call {
+	return &FeeQuoterInterface_ConvertTokenAmount_Call{Call: _e.mock.On("ConvertTokenAmount", opts, fromToken, fromTokenAmount, toToken)}
+}
+
+func (_c *FeeQuoterInterface_ConvertTokenAmount_Call) Run(run func(opts *bind.CallOpts, fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address)) *FeeQuoterInterface_ConvertTokenAmount_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(common.Address), args[2].(*big.Int), args[3].(common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ConvertTokenAmount_Call) Return(_a0 *big.Int, _a1 error) *FeeQuoterInterface_ConvertTokenAmount_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ConvertTokenAmount_Call) RunAndReturn(run func(*bind.CallOpts, common.Address, *big.Int, common.Address) (*big.Int, error)) *FeeQuoterInterface_ConvertTokenAmount_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterAuthorizedCallerAdded provides a mock function with given fields: opts
+func (_m *FeeQuoterInterface) FilterAuthorizedCallerAdded(opts *bind.FilterOpts) (*fee_quoter.FeeQuoterAuthorizedCallerAddedIterator, error) {
+	ret := _m.Called(opts)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterAuthorizedCallerAdded")
+	}
+
+	var r0 *fee_quoter.FeeQuoterAuthorizedCallerAddedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*fee_quoter.FeeQuoterAuthorizedCallerAddedIterator, error)); ok {
+		return rf(opts)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) *fee_quoter.FeeQuoterAuthorizedCallerAddedIterator); ok {
+		r0 = rf(opts)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterAuthorizedCallerAddedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts) error); ok {
+		r1 = rf(opts)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterAuthorizedCallerAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterAuthorizedCallerAdded'
+type FeeQuoterInterface_FilterAuthorizedCallerAdded_Call struct {
+	*mock.Call
+}
+
+// FilterAuthorizedCallerAdded is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+func (_e *FeeQuoterInterface_Expecter) FilterAuthorizedCallerAdded(opts interface{}) *FeeQuoterInterface_FilterAuthorizedCallerAdded_Call {
+	return &FeeQuoterInterface_FilterAuthorizedCallerAdded_Call{Call: _e.mock.On("FilterAuthorizedCallerAdded", opts)}
+}
+
+func (_c *FeeQuoterInterface_FilterAuthorizedCallerAdded_Call) Run(run func(opts *bind.FilterOpts)) *FeeQuoterInterface_FilterAuthorizedCallerAdded_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterAuthorizedCallerAdded_Call) Return(_a0 *fee_quoter.FeeQuoterAuthorizedCallerAddedIterator, _a1 error) *FeeQuoterInterface_FilterAuthorizedCallerAdded_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterAuthorizedCallerAdded_Call) RunAndReturn(run func(*bind.FilterOpts) (*fee_quoter.FeeQuoterAuthorizedCallerAddedIterator, error)) *FeeQuoterInterface_FilterAuthorizedCallerAdded_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterAuthorizedCallerRemoved provides a mock function with given fields: opts
+func (_m *FeeQuoterInterface) FilterAuthorizedCallerRemoved(opts *bind.FilterOpts) (*fee_quoter.FeeQuoterAuthorizedCallerRemovedIterator, error) {
+	ret := _m.Called(opts)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterAuthorizedCallerRemoved")
+	}
+
+	var r0 *fee_quoter.FeeQuoterAuthorizedCallerRemovedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*fee_quoter.FeeQuoterAuthorizedCallerRemovedIterator, error)); ok {
+		return rf(opts)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) *fee_quoter.FeeQuoterAuthorizedCallerRemovedIterator); ok {
+		r0 = rf(opts)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterAuthorizedCallerRemovedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts) error); ok {
+		r1 = rf(opts)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterAuthorizedCallerRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterAuthorizedCallerRemoved'
+type FeeQuoterInterface_FilterAuthorizedCallerRemoved_Call struct {
+	*mock.Call
+}
+
+// FilterAuthorizedCallerRemoved is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+func (_e *FeeQuoterInterface_Expecter) FilterAuthorizedCallerRemoved(opts interface{}) *FeeQuoterInterface_FilterAuthorizedCallerRemoved_Call {
+	return &FeeQuoterInterface_FilterAuthorizedCallerRemoved_Call{Call: _e.mock.On("FilterAuthorizedCallerRemoved", opts)}
+}
+
+func (_c *FeeQuoterInterface_FilterAuthorizedCallerRemoved_Call) Run(run func(opts *bind.FilterOpts)) *FeeQuoterInterface_FilterAuthorizedCallerRemoved_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterAuthorizedCallerRemoved_Call) Return(_a0 *fee_quoter.FeeQuoterAuthorizedCallerRemovedIterator, _a1 error) *FeeQuoterInterface_FilterAuthorizedCallerRemoved_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterAuthorizedCallerRemoved_Call) RunAndReturn(run func(*bind.FilterOpts) (*fee_quoter.FeeQuoterAuthorizedCallerRemovedIterator, error)) *FeeQuoterInterface_FilterAuthorizedCallerRemoved_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterDestChainAdded provides a mock function with given fields: opts, destChainSelector
+func (_m *FeeQuoterInterface) FilterDestChainAdded(opts *bind.FilterOpts, destChainSelector []uint64) (*fee_quoter.FeeQuoterDestChainAddedIterator, error) {
+	ret := _m.Called(opts, destChainSelector)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterDestChainAdded")
+	}
+
+	var r0 *fee_quoter.FeeQuoterDestChainAddedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*fee_quoter.FeeQuoterDestChainAddedIterator, error)); ok {
+		return rf(opts, destChainSelector)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) *fee_quoter.FeeQuoterDestChainAddedIterator); ok {
+		r0 = rf(opts, destChainSelector)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterDestChainAddedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []uint64) error); ok {
+		r1 = rf(opts, destChainSelector)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterDestChainAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterDestChainAdded'
+type FeeQuoterInterface_FilterDestChainAdded_Call struct {
+	*mock.Call
+}
+
+// FilterDestChainAdded is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - destChainSelector []uint64
+func (_e *FeeQuoterInterface_Expecter) FilterDestChainAdded(opts interface{}, destChainSelector interface{}) *FeeQuoterInterface_FilterDestChainAdded_Call {
+	return &FeeQuoterInterface_FilterDestChainAdded_Call{Call: _e.mock.On("FilterDestChainAdded", opts, destChainSelector)}
+}
+
+func (_c *FeeQuoterInterface_FilterDestChainAdded_Call) Run(run func(opts *bind.FilterOpts, destChainSelector []uint64)) *FeeQuoterInterface_FilterDestChainAdded_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]uint64))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterDestChainAdded_Call) Return(_a0 *fee_quoter.FeeQuoterDestChainAddedIterator, _a1 error) *FeeQuoterInterface_FilterDestChainAdded_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterDestChainAdded_Call) RunAndReturn(run func(*bind.FilterOpts, []uint64) (*fee_quoter.FeeQuoterDestChainAddedIterator, error)) *FeeQuoterInterface_FilterDestChainAdded_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterDestChainConfigUpdated provides a mock function with given fields: opts, destChainSelector
+func (_m *FeeQuoterInterface) FilterDestChainConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64) (*fee_quoter.FeeQuoterDestChainConfigUpdatedIterator, error) {
+	ret := _m.Called(opts, destChainSelector)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterDestChainConfigUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterDestChainConfigUpdatedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*fee_quoter.FeeQuoterDestChainConfigUpdatedIterator, error)); ok {
+		return rf(opts, destChainSelector)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) *fee_quoter.FeeQuoterDestChainConfigUpdatedIterator); ok {
+		r0 = rf(opts, destChainSelector)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterDestChainConfigUpdatedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []uint64) error); ok {
+		r1 = rf(opts, destChainSelector)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterDestChainConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterDestChainConfigUpdated'
+type FeeQuoterInterface_FilterDestChainConfigUpdated_Call struct {
+	*mock.Call
+}
+
+// FilterDestChainConfigUpdated is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - destChainSelector []uint64
+func (_e *FeeQuoterInterface_Expecter) FilterDestChainConfigUpdated(opts interface{}, destChainSelector interface{}) *FeeQuoterInterface_FilterDestChainConfigUpdated_Call {
+	return &FeeQuoterInterface_FilterDestChainConfigUpdated_Call{Call: _e.mock.On("FilterDestChainConfigUpdated", opts, destChainSelector)}
+}
+
+func (_c *FeeQuoterInterface_FilterDestChainConfigUpdated_Call) Run(run func(opts *bind.FilterOpts, destChainSelector []uint64)) *FeeQuoterInterface_FilterDestChainConfigUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]uint64))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterDestChainConfigUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterDestChainConfigUpdatedIterator, _a1 error) *FeeQuoterInterface_FilterDestChainConfigUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterDestChainConfigUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []uint64) (*fee_quoter.FeeQuoterDestChainConfigUpdatedIterator, error)) *FeeQuoterInterface_FilterDestChainConfigUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterFeeTokenAdded provides a mock function with given fields: opts, feeToken
+func (_m *FeeQuoterInterface) FilterFeeTokenAdded(opts *bind.FilterOpts, feeToken []common.Address) (*fee_quoter.FeeQuoterFeeTokenAddedIterator, error) {
+	ret := _m.Called(opts, feeToken)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterFeeTokenAdded")
+	}
+
+	var r0 *fee_quoter.FeeQuoterFeeTokenAddedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*fee_quoter.FeeQuoterFeeTokenAddedIterator, error)); ok {
+		return rf(opts, feeToken)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) *fee_quoter.FeeQuoterFeeTokenAddedIterator); ok {
+		r0 = rf(opts, feeToken)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterFeeTokenAddedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address) error); ok {
+		r1 = rf(opts, feeToken)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterFeeTokenAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterFeeTokenAdded'
+type FeeQuoterInterface_FilterFeeTokenAdded_Call struct {
+	*mock.Call
+}
+
+// FilterFeeTokenAdded is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - feeToken []common.Address
+func (_e *FeeQuoterInterface_Expecter) FilterFeeTokenAdded(opts interface{}, feeToken interface{}) *FeeQuoterInterface_FilterFeeTokenAdded_Call {
+	return &FeeQuoterInterface_FilterFeeTokenAdded_Call{Call: _e.mock.On("FilterFeeTokenAdded", opts, feeToken)}
+}
+
+func (_c *FeeQuoterInterface_FilterFeeTokenAdded_Call) Run(run func(opts *bind.FilterOpts, feeToken []common.Address)) *FeeQuoterInterface_FilterFeeTokenAdded_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterFeeTokenAdded_Call) Return(_a0 *fee_quoter.FeeQuoterFeeTokenAddedIterator, _a1 error) *FeeQuoterInterface_FilterFeeTokenAdded_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterFeeTokenAdded_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address) (*fee_quoter.FeeQuoterFeeTokenAddedIterator, error)) *FeeQuoterInterface_FilterFeeTokenAdded_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterFeeTokenRemoved provides a mock function with given fields: opts, feeToken
+func (_m *FeeQuoterInterface) FilterFeeTokenRemoved(opts *bind.FilterOpts, feeToken []common.Address) (*fee_quoter.FeeQuoterFeeTokenRemovedIterator, error) {
+	ret := _m.Called(opts, feeToken)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterFeeTokenRemoved")
+	}
+
+	var r0 *fee_quoter.FeeQuoterFeeTokenRemovedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*fee_quoter.FeeQuoterFeeTokenRemovedIterator, error)); ok {
+		return rf(opts, feeToken)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) *fee_quoter.FeeQuoterFeeTokenRemovedIterator); ok {
+		r0 = rf(opts, feeToken)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterFeeTokenRemovedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address) error); ok {
+		r1 = rf(opts, feeToken)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterFeeTokenRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterFeeTokenRemoved'
+type FeeQuoterInterface_FilterFeeTokenRemoved_Call struct {
+	*mock.Call
+}
+
+// FilterFeeTokenRemoved is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - feeToken []common.Address
+func (_e *FeeQuoterInterface_Expecter) FilterFeeTokenRemoved(opts interface{}, feeToken interface{}) *FeeQuoterInterface_FilterFeeTokenRemoved_Call {
+	return &FeeQuoterInterface_FilterFeeTokenRemoved_Call{Call: _e.mock.On("FilterFeeTokenRemoved", opts, feeToken)}
+}
+
+func (_c *FeeQuoterInterface_FilterFeeTokenRemoved_Call) Run(run func(opts *bind.FilterOpts, feeToken []common.Address)) *FeeQuoterInterface_FilterFeeTokenRemoved_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterFeeTokenRemoved_Call) Return(_a0 *fee_quoter.FeeQuoterFeeTokenRemovedIterator, _a1 error) *FeeQuoterInterface_FilterFeeTokenRemoved_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterFeeTokenRemoved_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address) (*fee_quoter.FeeQuoterFeeTokenRemovedIterator, error)) *FeeQuoterInterface_FilterFeeTokenRemoved_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterOwnershipTransferRequested provides a mock function with given fields: opts, from, to
+func (_m *FeeQuoterInterface) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*fee_quoter.FeeQuoterOwnershipTransferRequestedIterator, error) {
+	ret := _m.Called(opts, from, to)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
+	var r0 *fee_quoter.FeeQuoterOwnershipTransferRequestedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*fee_quoter.FeeQuoterOwnershipTransferRequestedIterator, error)); ok {
+		return rf(opts, from, to)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) *fee_quoter.FeeQuoterOwnershipTransferRequestedIterator); ok {
+		r0 = rf(opts, from, to)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterOwnershipTransferRequestedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address, []common.Address) error); ok {
+		r1 = rf(opts, from, to)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterOwnershipTransferRequested_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterOwnershipTransferRequested'
+type FeeQuoterInterface_FilterOwnershipTransferRequested_Call struct {
+	*mock.Call
+}
+
+// FilterOwnershipTransferRequested is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - from []common.Address
+//   - to []common.Address
+func (_e *FeeQuoterInterface_Expecter) FilterOwnershipTransferRequested(opts interface{}, from interface{}, to interface{}) *FeeQuoterInterface_FilterOwnershipTransferRequested_Call {
+	return &FeeQuoterInterface_FilterOwnershipTransferRequested_Call{Call: _e.mock.On("FilterOwnershipTransferRequested", opts, from, to)}
+}
+
+func (_c *FeeQuoterInterface_FilterOwnershipTransferRequested_Call) Run(run func(opts *bind.FilterOpts, from []common.Address, to []common.Address)) *FeeQuoterInterface_FilterOwnershipTransferRequested_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]common.Address), args[2].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterOwnershipTransferRequested_Call) Return(_a0 *fee_quoter.FeeQuoterOwnershipTransferRequestedIterator, _a1 error) *FeeQuoterInterface_FilterOwnershipTransferRequested_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterOwnershipTransferRequested_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address, []common.Address) (*fee_quoter.FeeQuoterOwnershipTransferRequestedIterator, error)) *FeeQuoterInterface_FilterOwnershipTransferRequested_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterOwnershipTransferred provides a mock function with given fields: opts, from, to
+func (_m *FeeQuoterInterface) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*fee_quoter.FeeQuoterOwnershipTransferredIterator, error) {
+	ret := _m.Called(opts, from, to)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
+	var r0 *fee_quoter.FeeQuoterOwnershipTransferredIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*fee_quoter.FeeQuoterOwnershipTransferredIterator, error)); ok {
+		return rf(opts, from, to)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) *fee_quoter.FeeQuoterOwnershipTransferredIterator); ok {
+		r0 = rf(opts, from, to)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterOwnershipTransferredIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address, []common.Address) error); ok {
+		r1 = rf(opts, from, to)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterOwnershipTransferred_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterOwnershipTransferred'
+type FeeQuoterInterface_FilterOwnershipTransferred_Call struct {
+	*mock.Call
+}
+
+// FilterOwnershipTransferred is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - from []common.Address
+//   - to []common.Address
+func (_e *FeeQuoterInterface_Expecter) FilterOwnershipTransferred(opts interface{}, from interface{}, to interface{}) *FeeQuoterInterface_FilterOwnershipTransferred_Call {
+	return &FeeQuoterInterface_FilterOwnershipTransferred_Call{Call: _e.mock.On("FilterOwnershipTransferred", opts, from, to)}
+}
+
+func (_c *FeeQuoterInterface_FilterOwnershipTransferred_Call) Run(run func(opts *bind.FilterOpts, from []common.Address, to []common.Address)) *FeeQuoterInterface_FilterOwnershipTransferred_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]common.Address), args[2].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterOwnershipTransferred_Call) Return(_a0 *fee_quoter.FeeQuoterOwnershipTransferredIterator, _a1 error) *FeeQuoterInterface_FilterOwnershipTransferred_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterOwnershipTransferred_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address, []common.Address) (*fee_quoter.FeeQuoterOwnershipTransferredIterator, error)) *FeeQuoterInterface_FilterOwnershipTransferred_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterPremiumMultiplierWeiPerEthUpdated provides a mock function with given fields: opts, token
+func (_m *FeeQuoterInterface) FilterPremiumMultiplierWeiPerEthUpdated(opts *bind.FilterOpts, token []common.Address) (*fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator, error) {
+	ret := _m.Called(opts, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterPremiumMultiplierWeiPerEthUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator, error)); ok {
+		return rf(opts, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator); ok {
+		r0 = rf(opts, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address) error); ok {
+		r1 = rf(opts, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterPremiumMultiplierWeiPerEthUpdated'
+type FeeQuoterInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call struct {
+	*mock.Call
+}
+
+// FilterPremiumMultiplierWeiPerEthUpdated is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - token []common.Address
+func (_e *FeeQuoterInterface_Expecter) FilterPremiumMultiplierWeiPerEthUpdated(opts interface{}, token interface{}) *FeeQuoterInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call {
+	return &FeeQuoterInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call{Call: _e.mock.On("FilterPremiumMultiplierWeiPerEthUpdated", opts, token)}
+}
+
+func (_c *FeeQuoterInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call) Run(run func(opts *bind.FilterOpts, token []common.Address)) *FeeQuoterInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator, _a1 error) *FeeQuoterInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address) (*fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdatedIterator, error)) *FeeQuoterInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterPriceFeedPerTokenUpdated provides a mock function with given fields: opts, token
+func (_m *FeeQuoterInterface) FilterPriceFeedPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*fee_quoter.FeeQuoterPriceFeedPerTokenUpdatedIterator, error) {
+	ret := _m.Called(opts, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterPriceFeedPerTokenUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterPriceFeedPerTokenUpdatedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*fee_quoter.FeeQuoterPriceFeedPerTokenUpdatedIterator, error)); ok {
+		return rf(opts, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) *fee_quoter.FeeQuoterPriceFeedPerTokenUpdatedIterator); ok {
+		r0 = rf(opts, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterPriceFeedPerTokenUpdatedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address) error); ok {
+		r1 = rf(opts, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterPriceFeedPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterPriceFeedPerTokenUpdated'
+type FeeQuoterInterface_FilterPriceFeedPerTokenUpdated_Call struct {
+	*mock.Call
+}
+
+// FilterPriceFeedPerTokenUpdated is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - token []common.Address
+func (_e *FeeQuoterInterface_Expecter) FilterPriceFeedPerTokenUpdated(opts interface{}, token interface{}) *FeeQuoterInterface_FilterPriceFeedPerTokenUpdated_Call {
+	return &FeeQuoterInterface_FilterPriceFeedPerTokenUpdated_Call{Call: _e.mock.On("FilterPriceFeedPerTokenUpdated", opts, token)}
+}
+
+func (_c *FeeQuoterInterface_FilterPriceFeedPerTokenUpdated_Call) Run(run func(opts *bind.FilterOpts, token []common.Address)) *FeeQuoterInterface_FilterPriceFeedPerTokenUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterPriceFeedPerTokenUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterPriceFeedPerTokenUpdatedIterator, _a1 error) *FeeQuoterInterface_FilterPriceFeedPerTokenUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterPriceFeedPerTokenUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address) (*fee_quoter.FeeQuoterPriceFeedPerTokenUpdatedIterator, error)) *FeeQuoterInterface_FilterPriceFeedPerTokenUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterReportPermissionSet provides a mock function with given fields: opts, reportId
+func (_m *FeeQuoterInterface) FilterReportPermissionSet(opts *bind.FilterOpts, reportId [][32]byte) (*fee_quoter.FeeQuoterReportPermissionSetIterator, error) {
+	ret := _m.Called(opts, reportId)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterReportPermissionSet")
+	}
+
+	var r0 *fee_quoter.FeeQuoterReportPermissionSetIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, [][32]byte) (*fee_quoter.FeeQuoterReportPermissionSetIterator, error)); ok {
+		return rf(opts, reportId)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, [][32]byte) *fee_quoter.FeeQuoterReportPermissionSetIterator); ok {
+		r0 = rf(opts, reportId)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterReportPermissionSetIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, [][32]byte) error); ok {
+		r1 = rf(opts, reportId)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterReportPermissionSet_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterReportPermissionSet'
+type FeeQuoterInterface_FilterReportPermissionSet_Call struct {
+	*mock.Call
+}
+
+// FilterReportPermissionSet is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - reportId [][32]byte
+func (_e *FeeQuoterInterface_Expecter) FilterReportPermissionSet(opts interface{}, reportId interface{}) *FeeQuoterInterface_FilterReportPermissionSet_Call {
+	return &FeeQuoterInterface_FilterReportPermissionSet_Call{Call: _e.mock.On("FilterReportPermissionSet", opts, reportId)}
+}
+
+func (_c *FeeQuoterInterface_FilterReportPermissionSet_Call) Run(run func(opts *bind.FilterOpts, reportId [][32]byte)) *FeeQuoterInterface_FilterReportPermissionSet_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([][32]byte))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterReportPermissionSet_Call) Return(_a0 *fee_quoter.FeeQuoterReportPermissionSetIterator, _a1 error) *FeeQuoterInterface_FilterReportPermissionSet_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterReportPermissionSet_Call) RunAndReturn(run func(*bind.FilterOpts, [][32]byte) (*fee_quoter.FeeQuoterReportPermissionSetIterator, error)) *FeeQuoterInterface_FilterReportPermissionSet_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterTokenTransferFeeConfigDeleted provides a mock function with given fields: opts, destChainSelector, token
+func (_m *FeeQuoterInterface) FilterTokenTransferFeeConfigDeleted(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*fee_quoter.FeeQuoterTokenTransferFeeConfigDeletedIterator, error) {
+	ret := _m.Called(opts, destChainSelector, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterTokenTransferFeeConfigDeleted")
+	}
+
+	var r0 *fee_quoter.FeeQuoterTokenTransferFeeConfigDeletedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64, []common.Address) (*fee_quoter.FeeQuoterTokenTransferFeeConfigDeletedIterator, error)); ok {
+		return rf(opts, destChainSelector, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64, []common.Address) *fee_quoter.FeeQuoterTokenTransferFeeConfigDeletedIterator); ok {
+		r0 = rf(opts, destChainSelector, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterTokenTransferFeeConfigDeletedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []uint64, []common.Address) error); ok {
+		r1 = rf(opts, destChainSelector, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterTokenTransferFeeConfigDeleted_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterTokenTransferFeeConfigDeleted'
+type FeeQuoterInterface_FilterTokenTransferFeeConfigDeleted_Call struct {
+	*mock.Call
+}
+
+// FilterTokenTransferFeeConfigDeleted is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - destChainSelector []uint64
+//   - token []common.Address
+func (_e *FeeQuoterInterface_Expecter) FilterTokenTransferFeeConfigDeleted(opts interface{}, destChainSelector interface{}, token interface{}) *FeeQuoterInterface_FilterTokenTransferFeeConfigDeleted_Call {
+	return &FeeQuoterInterface_FilterTokenTransferFeeConfigDeleted_Call{Call: _e.mock.On("FilterTokenTransferFeeConfigDeleted", opts, destChainSelector, token)}
+}
+
+func (_c *FeeQuoterInterface_FilterTokenTransferFeeConfigDeleted_Call) Run(run func(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address)) *FeeQuoterInterface_FilterTokenTransferFeeConfigDeleted_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]uint64), args[2].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterTokenTransferFeeConfigDeleted_Call) Return(_a0 *fee_quoter.FeeQuoterTokenTransferFeeConfigDeletedIterator, _a1 error) *FeeQuoterInterface_FilterTokenTransferFeeConfigDeleted_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterTokenTransferFeeConfigDeleted_Call) RunAndReturn(run func(*bind.FilterOpts, []uint64, []common.Address) (*fee_quoter.FeeQuoterTokenTransferFeeConfigDeletedIterator, error)) *FeeQuoterInterface_FilterTokenTransferFeeConfigDeleted_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterTokenTransferFeeConfigUpdated provides a mock function with given fields: opts, destChainSelector, token
+func (_m *FeeQuoterInterface) FilterTokenTransferFeeConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*fee_quoter.FeeQuoterTokenTransferFeeConfigUpdatedIterator, error) {
+	ret := _m.Called(opts, destChainSelector, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterTokenTransferFeeConfigUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdatedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64, []common.Address) (*fee_quoter.FeeQuoterTokenTransferFeeConfigUpdatedIterator, error)); ok {
+		return rf(opts, destChainSelector, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64, []common.Address) *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdatedIterator); ok {
+		r0 = rf(opts, destChainSelector, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterTokenTransferFeeConfigUpdatedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []uint64, []common.Address) error); ok {
+		r1 = rf(opts, destChainSelector, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterTokenTransferFeeConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterTokenTransferFeeConfigUpdated'
+type FeeQuoterInterface_FilterTokenTransferFeeConfigUpdated_Call struct {
+	*mock.Call
+}
+
+// FilterTokenTransferFeeConfigUpdated is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - destChainSelector []uint64
+//   - token []common.Address
+func (_e *FeeQuoterInterface_Expecter) FilterTokenTransferFeeConfigUpdated(opts interface{}, destChainSelector interface{}, token interface{}) *FeeQuoterInterface_FilterTokenTransferFeeConfigUpdated_Call {
+	return &FeeQuoterInterface_FilterTokenTransferFeeConfigUpdated_Call{Call: _e.mock.On("FilterTokenTransferFeeConfigUpdated", opts, destChainSelector, token)}
+}
+
+func (_c *FeeQuoterInterface_FilterTokenTransferFeeConfigUpdated_Call) Run(run func(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address)) *FeeQuoterInterface_FilterTokenTransferFeeConfigUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]uint64), args[2].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterTokenTransferFeeConfigUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdatedIterator, _a1 error) *FeeQuoterInterface_FilterTokenTransferFeeConfigUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterTokenTransferFeeConfigUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []uint64, []common.Address) (*fee_quoter.FeeQuoterTokenTransferFeeConfigUpdatedIterator, error)) *FeeQuoterInterface_FilterTokenTransferFeeConfigUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterUsdPerTokenUpdated provides a mock function with given fields: opts, token
+func (_m *FeeQuoterInterface) FilterUsdPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*fee_quoter.FeeQuoterUsdPerTokenUpdatedIterator, error) {
+	ret := _m.Called(opts, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterUsdPerTokenUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterUsdPerTokenUpdatedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*fee_quoter.FeeQuoterUsdPerTokenUpdatedIterator, error)); ok {
+		return rf(opts, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) *fee_quoter.FeeQuoterUsdPerTokenUpdatedIterator); ok {
+		r0 = rf(opts, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterUsdPerTokenUpdatedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address) error); ok {
+		r1 = rf(opts, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterUsdPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterUsdPerTokenUpdated'
+type FeeQuoterInterface_FilterUsdPerTokenUpdated_Call struct {
+	*mock.Call
+}
+
+// FilterUsdPerTokenUpdated is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - token []common.Address
+func (_e *FeeQuoterInterface_Expecter) FilterUsdPerTokenUpdated(opts interface{}, token interface{}) *FeeQuoterInterface_FilterUsdPerTokenUpdated_Call {
+	return &FeeQuoterInterface_FilterUsdPerTokenUpdated_Call{Call: _e.mock.On("FilterUsdPerTokenUpdated", opts, token)}
+}
+
+func (_c *FeeQuoterInterface_FilterUsdPerTokenUpdated_Call) Run(run func(opts *bind.FilterOpts, token []common.Address)) *FeeQuoterInterface_FilterUsdPerTokenUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterUsdPerTokenUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterUsdPerTokenUpdatedIterator, _a1 error) *FeeQuoterInterface_FilterUsdPerTokenUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterUsdPerTokenUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address) (*fee_quoter.FeeQuoterUsdPerTokenUpdatedIterator, error)) *FeeQuoterInterface_FilterUsdPerTokenUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FilterUsdPerUnitGasUpdated provides a mock function with given fields: opts, destChain
+func (_m *FeeQuoterInterface) FilterUsdPerUnitGasUpdated(opts *bind.FilterOpts, destChain []uint64) (*fee_quoter.FeeQuoterUsdPerUnitGasUpdatedIterator, error) {
+	ret := _m.Called(opts, destChain)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FilterUsdPerUnitGasUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterUsdPerUnitGasUpdatedIterator
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*fee_quoter.FeeQuoterUsdPerUnitGasUpdatedIterator, error)); ok {
+		return rf(opts, destChain)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) *fee_quoter.FeeQuoterUsdPerUnitGasUpdatedIterator); ok {
+		r0 = rf(opts, destChain)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterUsdPerUnitGasUpdatedIterator)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []uint64) error); ok {
+		r1 = rf(opts, destChain)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_FilterUsdPerUnitGasUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterUsdPerUnitGasUpdated'
+type FeeQuoterInterface_FilterUsdPerUnitGasUpdated_Call struct {
+	*mock.Call
+}
+
+// FilterUsdPerUnitGasUpdated is a helper method to define mock.On call
+//   - opts *bind.FilterOpts
+//   - destChain []uint64
+func (_e *FeeQuoterInterface_Expecter) FilterUsdPerUnitGasUpdated(opts interface{}, destChain interface{}) *FeeQuoterInterface_FilterUsdPerUnitGasUpdated_Call {
+	return &FeeQuoterInterface_FilterUsdPerUnitGasUpdated_Call{Call: _e.mock.On("FilterUsdPerUnitGasUpdated", opts, destChain)}
+}
+
+func (_c *FeeQuoterInterface_FilterUsdPerUnitGasUpdated_Call) Run(run func(opts *bind.FilterOpts, destChain []uint64)) *FeeQuoterInterface_FilterUsdPerUnitGasUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.FilterOpts), args[1].([]uint64))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterUsdPerUnitGasUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterUsdPerUnitGasUpdatedIterator, _a1 error) *FeeQuoterInterface_FilterUsdPerUnitGasUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_FilterUsdPerUnitGasUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []uint64) (*fee_quoter.FeeQuoterUsdPerUnitGasUpdatedIterator, error)) *FeeQuoterInterface_FilterUsdPerUnitGasUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetAllAuthorizedCallers provides a mock function with given fields: opts
+func (_m *FeeQuoterInterface) GetAllAuthorizedCallers(opts *bind.CallOpts) ([]common.Address, error) {
+	ret := _m.Called(opts)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllAuthorizedCallers")
+	}
+
+	var r0 []common.Address
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([]common.Address, error)); ok {
+		return rf(opts)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts) []common.Address); ok {
+		r0 = rf(opts)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]common.Address)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts) error); ok {
+		r1 = rf(opts)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetAllAuthorizedCallers_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetAllAuthorizedCallers'
+type FeeQuoterInterface_GetAllAuthorizedCallers_Call struct {
+	*mock.Call
+}
+
+// GetAllAuthorizedCallers is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+func (_e *FeeQuoterInterface_Expecter) GetAllAuthorizedCallers(opts interface{}) *FeeQuoterInterface_GetAllAuthorizedCallers_Call {
+	return &FeeQuoterInterface_GetAllAuthorizedCallers_Call{Call: _e.mock.On("GetAllAuthorizedCallers", opts)}
+}
+
+func (_c *FeeQuoterInterface_GetAllAuthorizedCallers_Call) Run(run func(opts *bind.CallOpts)) *FeeQuoterInterface_GetAllAuthorizedCallers_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetAllAuthorizedCallers_Call) Return(_a0 []common.Address, _a1 error) *FeeQuoterInterface_GetAllAuthorizedCallers_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetAllAuthorizedCallers_Call) RunAndReturn(run func(*bind.CallOpts) ([]common.Address, error)) *FeeQuoterInterface_GetAllAuthorizedCallers_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetDestChainConfig provides a mock function with given fields: opts, destChainSelector
+func (_m *FeeQuoterInterface) GetDestChainConfig(opts *bind.CallOpts, destChainSelector uint64) (fee_quoter.FeeQuoterDestChainConfig, error) {
+	ret := _m.Called(opts, destChainSelector)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetDestChainConfig")
+	}
+
+	var r0 fee_quoter.FeeQuoterDestChainConfig
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) (fee_quoter.FeeQuoterDestChainConfig, error)); ok {
+		return rf(opts, destChainSelector)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) fee_quoter.FeeQuoterDestChainConfig); ok {
+		r0 = rf(opts, destChainSelector)
+	} else {
+		r0 = ret.Get(0).(fee_quoter.FeeQuoterDestChainConfig)
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64) error); ok {
+		r1 = rf(opts, destChainSelector)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetDestChainConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDestChainConfig'
+type FeeQuoterInterface_GetDestChainConfig_Call struct {
+	*mock.Call
+}
+
+// GetDestChainConfig is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - destChainSelector uint64
+func (_e *FeeQuoterInterface_Expecter) GetDestChainConfig(opts interface{}, destChainSelector interface{}) *FeeQuoterInterface_GetDestChainConfig_Call {
+	return &FeeQuoterInterface_GetDestChainConfig_Call{Call: _e.mock.On("GetDestChainConfig", opts, destChainSelector)}
+}
+
+func (_c *FeeQuoterInterface_GetDestChainConfig_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64)) *FeeQuoterInterface_GetDestChainConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(uint64))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetDestChainConfig_Call) Return(_a0 fee_quoter.FeeQuoterDestChainConfig, _a1 error) *FeeQuoterInterface_GetDestChainConfig_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetDestChainConfig_Call) RunAndReturn(run func(*bind.CallOpts, uint64) (fee_quoter.FeeQuoterDestChainConfig, error)) *FeeQuoterInterface_GetDestChainConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetDestinationChainGasPrice provides a mock function with given fields: opts, destChainSelector
+func (_m *FeeQuoterInterface) GetDestinationChainGasPrice(opts *bind.CallOpts, destChainSelector uint64) (fee_quoter.InternalTimestampedPackedUint224, error) {
+	ret := _m.Called(opts, destChainSelector)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetDestinationChainGasPrice")
+	}
+
+	var r0 fee_quoter.InternalTimestampedPackedUint224
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) (fee_quoter.InternalTimestampedPackedUint224, error)); ok {
+		return rf(opts, destChainSelector)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) fee_quoter.InternalTimestampedPackedUint224); ok {
+		r0 = rf(opts, destChainSelector)
+	} else {
+		r0 = ret.Get(0).(fee_quoter.InternalTimestampedPackedUint224)
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64) error); ok {
+		r1 = rf(opts, destChainSelector)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetDestinationChainGasPrice_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDestinationChainGasPrice'
+type FeeQuoterInterface_GetDestinationChainGasPrice_Call struct {
+	*mock.Call
+}
+
+// GetDestinationChainGasPrice is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - destChainSelector uint64
+func (_e *FeeQuoterInterface_Expecter) GetDestinationChainGasPrice(opts interface{}, destChainSelector interface{}) *FeeQuoterInterface_GetDestinationChainGasPrice_Call {
+	return &FeeQuoterInterface_GetDestinationChainGasPrice_Call{Call: _e.mock.On("GetDestinationChainGasPrice", opts, destChainSelector)}
+}
+
+func (_c *FeeQuoterInterface_GetDestinationChainGasPrice_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64)) *FeeQuoterInterface_GetDestinationChainGasPrice_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(uint64))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetDestinationChainGasPrice_Call) Return(_a0 fee_quoter.InternalTimestampedPackedUint224, _a1 error) *FeeQuoterInterface_GetDestinationChainGasPrice_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetDestinationChainGasPrice_Call) RunAndReturn(run func(*bind.CallOpts, uint64) (fee_quoter.InternalTimestampedPackedUint224, error)) *FeeQuoterInterface_GetDestinationChainGasPrice_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetFeeTokens provides a mock function with given fields: opts
+func (_m *FeeQuoterInterface) GetFeeTokens(opts *bind.CallOpts) ([]common.Address, error) {
+	ret := _m.Called(opts)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetFeeTokens")
+	}
+
+	var r0 []common.Address
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([]common.Address, error)); ok {
+		return rf(opts)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts) []common.Address); ok {
+		r0 = rf(opts)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]common.Address)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts) error); ok {
+		r1 = rf(opts)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetFeeTokens_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetFeeTokens'
+type FeeQuoterInterface_GetFeeTokens_Call struct {
+	*mock.Call
+}
+
+// GetFeeTokens is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+func (_e *FeeQuoterInterface_Expecter) GetFeeTokens(opts interface{}) *FeeQuoterInterface_GetFeeTokens_Call {
+	return &FeeQuoterInterface_GetFeeTokens_Call{Call: _e.mock.On("GetFeeTokens", opts)}
+}
+
+func (_c *FeeQuoterInterface_GetFeeTokens_Call) Run(run func(opts *bind.CallOpts)) *FeeQuoterInterface_GetFeeTokens_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetFeeTokens_Call) Return(_a0 []common.Address, _a1 error) *FeeQuoterInterface_GetFeeTokens_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetFeeTokens_Call) RunAndReturn(run func(*bind.CallOpts) ([]common.Address, error)) *FeeQuoterInterface_GetFeeTokens_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetPremiumMultiplierWeiPerEth provides a mock function with given fields: opts, token
+func (_m *FeeQuoterInterface) GetPremiumMultiplierWeiPerEth(opts *bind.CallOpts, token common.Address) (uint64, error) {
+	ret := _m.Called(opts, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetPremiumMultiplierWeiPerEth")
+	}
+
+	var r0 uint64
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (uint64, error)); ok {
+		return rf(opts, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) uint64); ok {
+		r0 = rf(opts, token)
+	} else {
+		r0 = ret.Get(0).(uint64)
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address) error); ok {
+		r1 = rf(opts, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetPremiumMultiplierWeiPerEth_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetPremiumMultiplierWeiPerEth'
+type FeeQuoterInterface_GetPremiumMultiplierWeiPerEth_Call struct {
+	*mock.Call
+}
+
+// GetPremiumMultiplierWeiPerEth is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - token common.Address
+func (_e *FeeQuoterInterface_Expecter) GetPremiumMultiplierWeiPerEth(opts interface{}, token interface{}) *FeeQuoterInterface_GetPremiumMultiplierWeiPerEth_Call {
+	return &FeeQuoterInterface_GetPremiumMultiplierWeiPerEth_Call{Call: _e.mock.On("GetPremiumMultiplierWeiPerEth", opts, token)}
+}
+
+func (_c *FeeQuoterInterface_GetPremiumMultiplierWeiPerEth_Call) Run(run func(opts *bind.CallOpts, token common.Address)) *FeeQuoterInterface_GetPremiumMultiplierWeiPerEth_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetPremiumMultiplierWeiPerEth_Call) Return(_a0 uint64, _a1 error) *FeeQuoterInterface_GetPremiumMultiplierWeiPerEth_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetPremiumMultiplierWeiPerEth_Call) RunAndReturn(run func(*bind.CallOpts, common.Address) (uint64, error)) *FeeQuoterInterface_GetPremiumMultiplierWeiPerEth_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetStaticConfig provides a mock function with given fields: opts
+func (_m *FeeQuoterInterface) GetStaticConfig(opts *bind.CallOpts) (fee_quoter.FeeQuoterStaticConfig, error) {
+	ret := _m.Called(opts)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetStaticConfig")
+	}
+
+	var r0 fee_quoter.FeeQuoterStaticConfig
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (fee_quoter.FeeQuoterStaticConfig, error)); ok {
+		return rf(opts)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts) fee_quoter.FeeQuoterStaticConfig); ok {
+		r0 = rf(opts)
+	} else {
+		r0 = ret.Get(0).(fee_quoter.FeeQuoterStaticConfig)
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts) error); ok {
+		r1 = rf(opts)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetStaticConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetStaticConfig'
+type FeeQuoterInterface_GetStaticConfig_Call struct {
+	*mock.Call
+}
+
+// GetStaticConfig is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+func (_e *FeeQuoterInterface_Expecter) GetStaticConfig(opts interface{}) *FeeQuoterInterface_GetStaticConfig_Call {
+	return &FeeQuoterInterface_GetStaticConfig_Call{Call: _e.mock.On("GetStaticConfig", opts)}
+}
+
+func (_c *FeeQuoterInterface_GetStaticConfig_Call) Run(run func(opts *bind.CallOpts)) *FeeQuoterInterface_GetStaticConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetStaticConfig_Call) Return(_a0 fee_quoter.FeeQuoterStaticConfig, _a1 error) *FeeQuoterInterface_GetStaticConfig_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetStaticConfig_Call) RunAndReturn(run func(*bind.CallOpts) (fee_quoter.FeeQuoterStaticConfig, error)) *FeeQuoterInterface_GetStaticConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetTokenAndGasPrices provides a mock function with given fields: opts, token, destChainSelector
+func (_m *FeeQuoterInterface) GetTokenAndGasPrices(opts *bind.CallOpts, token common.Address, destChainSelector uint64) (fee_quoter.GetTokenAndGasPrices, error) {
+	ret := _m.Called(opts, token, destChainSelector)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetTokenAndGasPrices")
+	}
+
+	var r0 fee_quoter.GetTokenAndGasPrices
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, uint64) (fee_quoter.GetTokenAndGasPrices, error)); ok {
+		return rf(opts, token, destChainSelector)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, uint64) fee_quoter.GetTokenAndGasPrices); ok {
+		r0 = rf(opts, token, destChainSelector)
+	} else {
+		r0 = ret.Get(0).(fee_quoter.GetTokenAndGasPrices)
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address, uint64) error); ok {
+		r1 = rf(opts, token, destChainSelector)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetTokenAndGasPrices_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTokenAndGasPrices'
+type FeeQuoterInterface_GetTokenAndGasPrices_Call struct {
+	*mock.Call
+}
+
+// GetTokenAndGasPrices is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - token common.Address
+//   - destChainSelector uint64
+func (_e *FeeQuoterInterface_Expecter) GetTokenAndGasPrices(opts interface{}, token interface{}, destChainSelector interface{}) *FeeQuoterInterface_GetTokenAndGasPrices_Call {
+	return &FeeQuoterInterface_GetTokenAndGasPrices_Call{Call: _e.mock.On("GetTokenAndGasPrices", opts, token, destChainSelector)}
+}
+
+func (_c *FeeQuoterInterface_GetTokenAndGasPrices_Call) Run(run func(opts *bind.CallOpts, token common.Address, destChainSelector uint64)) *FeeQuoterInterface_GetTokenAndGasPrices_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(common.Address), args[2].(uint64))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetTokenAndGasPrices_Call) Return(_a0 fee_quoter.GetTokenAndGasPrices, _a1 error) *FeeQuoterInterface_GetTokenAndGasPrices_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetTokenAndGasPrices_Call) RunAndReturn(run func(*bind.CallOpts, common.Address, uint64) (fee_quoter.GetTokenAndGasPrices, error)) *FeeQuoterInterface_GetTokenAndGasPrices_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetTokenPrice provides a mock function with given fields: opts, token
+func (_m *FeeQuoterInterface) GetTokenPrice(opts *bind.CallOpts, token common.Address) (fee_quoter.InternalTimestampedPackedUint224, error) {
+	ret := _m.Called(opts, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetTokenPrice")
+	}
+
+	var r0 fee_quoter.InternalTimestampedPackedUint224
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (fee_quoter.InternalTimestampedPackedUint224, error)); ok {
+		return rf(opts, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) fee_quoter.InternalTimestampedPackedUint224); ok {
+		r0 = rf(opts, token)
+	} else {
+		r0 = ret.Get(0).(fee_quoter.InternalTimestampedPackedUint224)
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address) error); ok {
+		r1 = rf(opts, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetTokenPrice_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTokenPrice'
+type FeeQuoterInterface_GetTokenPrice_Call struct {
+	*mock.Call
+}
+
+// GetTokenPrice is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - token common.Address
+func (_e *FeeQuoterInterface_Expecter) GetTokenPrice(opts interface{}, token interface{}) *FeeQuoterInterface_GetTokenPrice_Call {
+	return &FeeQuoterInterface_GetTokenPrice_Call{Call: _e.mock.On("GetTokenPrice", opts, token)}
+}
+
+func (_c *FeeQuoterInterface_GetTokenPrice_Call) Run(run func(opts *bind.CallOpts, token common.Address)) *FeeQuoterInterface_GetTokenPrice_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetTokenPrice_Call) Return(_a0 fee_quoter.InternalTimestampedPackedUint224, _a1 error) *FeeQuoterInterface_GetTokenPrice_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetTokenPrice_Call) RunAndReturn(run func(*bind.CallOpts, common.Address) (fee_quoter.InternalTimestampedPackedUint224, error)) *FeeQuoterInterface_GetTokenPrice_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetTokenPriceFeedConfig provides a mock function with given fields: opts, token
+func (_m *FeeQuoterInterface) GetTokenPriceFeedConfig(opts *bind.CallOpts, token common.Address) (fee_quoter.IFeeQuoterTokenPriceFeedConfig, error) {
+	ret := _m.Called(opts, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetTokenPriceFeedConfig")
+	}
+
+	var r0 fee_quoter.IFeeQuoterTokenPriceFeedConfig
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (fee_quoter.IFeeQuoterTokenPriceFeedConfig, error)); ok {
+		return rf(opts, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) fee_quoter.IFeeQuoterTokenPriceFeedConfig); ok {
+		r0 = rf(opts, token)
+	} else {
+		r0 = ret.Get(0).(fee_quoter.IFeeQuoterTokenPriceFeedConfig)
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address) error); ok {
+		r1 = rf(opts, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetTokenPriceFeedConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTokenPriceFeedConfig'
+type FeeQuoterInterface_GetTokenPriceFeedConfig_Call struct {
+	*mock.Call
+}
+
+// GetTokenPriceFeedConfig is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - token common.Address
+func (_e *FeeQuoterInterface_Expecter) GetTokenPriceFeedConfig(opts interface{}, token interface{}) *FeeQuoterInterface_GetTokenPriceFeedConfig_Call {
+	return &FeeQuoterInterface_GetTokenPriceFeedConfig_Call{Call: _e.mock.On("GetTokenPriceFeedConfig", opts, token)}
+}
+
+func (_c *FeeQuoterInterface_GetTokenPriceFeedConfig_Call) Run(run func(opts *bind.CallOpts, token common.Address)) *FeeQuoterInterface_GetTokenPriceFeedConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetTokenPriceFeedConfig_Call) Return(_a0 fee_quoter.IFeeQuoterTokenPriceFeedConfig, _a1 error) *FeeQuoterInterface_GetTokenPriceFeedConfig_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetTokenPriceFeedConfig_Call) RunAndReturn(run func(*bind.CallOpts, common.Address) (fee_quoter.IFeeQuoterTokenPriceFeedConfig, error)) *FeeQuoterInterface_GetTokenPriceFeedConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetTokenPrices provides a mock function with given fields: opts, tokens
+func (_m *FeeQuoterInterface) GetTokenPrices(opts *bind.CallOpts, tokens []common.Address) ([]fee_quoter.InternalTimestampedPackedUint224, error) {
+	ret := _m.Called(opts, tokens)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetTokenPrices")
+	}
+
+	var r0 []fee_quoter.InternalTimestampedPackedUint224
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, []common.Address) ([]fee_quoter.InternalTimestampedPackedUint224, error)); ok {
+		return rf(opts, tokens)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, []common.Address) []fee_quoter.InternalTimestampedPackedUint224); ok {
+		r0 = rf(opts, tokens)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]fee_quoter.InternalTimestampedPackedUint224)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, []common.Address) error); ok {
+		r1 = rf(opts, tokens)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetTokenPrices_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTokenPrices'
+type FeeQuoterInterface_GetTokenPrices_Call struct {
+	*mock.Call
+}
+
+// GetTokenPrices is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - tokens []common.Address
+func (_e *FeeQuoterInterface_Expecter) GetTokenPrices(opts interface{}, tokens interface{}) *FeeQuoterInterface_GetTokenPrices_Call {
+	return &FeeQuoterInterface_GetTokenPrices_Call{Call: _e.mock.On("GetTokenPrices", opts, tokens)}
+}
+
+func (_c *FeeQuoterInterface_GetTokenPrices_Call) Run(run func(opts *bind.CallOpts, tokens []common.Address)) *FeeQuoterInterface_GetTokenPrices_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetTokenPrices_Call) Return(_a0 []fee_quoter.InternalTimestampedPackedUint224, _a1 error) *FeeQuoterInterface_GetTokenPrices_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetTokenPrices_Call) RunAndReturn(run func(*bind.CallOpts, []common.Address) ([]fee_quoter.InternalTimestampedPackedUint224, error)) *FeeQuoterInterface_GetTokenPrices_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetTokenTransferFeeConfig provides a mock function with given fields: opts, destChainSelector, token
+func (_m *FeeQuoterInterface) GetTokenTransferFeeConfig(opts *bind.CallOpts, destChainSelector uint64, token common.Address) (fee_quoter.FeeQuoterTokenTransferFeeConfig, error) {
+	ret := _m.Called(opts, destChainSelector, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetTokenTransferFeeConfig")
+	}
+
+	var r0 fee_quoter.FeeQuoterTokenTransferFeeConfig
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, common.Address) (fee_quoter.FeeQuoterTokenTransferFeeConfig, error)); ok {
+		return rf(opts, destChainSelector, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, common.Address) fee_quoter.FeeQuoterTokenTransferFeeConfig); ok {
+		r0 = rf(opts, destChainSelector, token)
+	} else {
+		r0 = ret.Get(0).(fee_quoter.FeeQuoterTokenTransferFeeConfig)
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64, common.Address) error); ok {
+		r1 = rf(opts, destChainSelector, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetTokenTransferFeeConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTokenTransferFeeConfig'
+type FeeQuoterInterface_GetTokenTransferFeeConfig_Call struct {
+	*mock.Call
+}
+
+// GetTokenTransferFeeConfig is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - destChainSelector uint64
+//   - token common.Address
+func (_e *FeeQuoterInterface_Expecter) GetTokenTransferFeeConfig(opts interface{}, destChainSelector interface{}, token interface{}) *FeeQuoterInterface_GetTokenTransferFeeConfig_Call {
+	return &FeeQuoterInterface_GetTokenTransferFeeConfig_Call{Call: _e.mock.On("GetTokenTransferFeeConfig", opts, destChainSelector, token)}
+}
+
+func (_c *FeeQuoterInterface_GetTokenTransferFeeConfig_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64, token common.Address)) *FeeQuoterInterface_GetTokenTransferFeeConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(uint64), args[2].(common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetTokenTransferFeeConfig_Call) Return(_a0 fee_quoter.FeeQuoterTokenTransferFeeConfig, _a1 error) *FeeQuoterInterface_GetTokenTransferFeeConfig_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetTokenTransferFeeConfig_Call) RunAndReturn(run func(*bind.CallOpts, uint64, common.Address) (fee_quoter.FeeQuoterTokenTransferFeeConfig, error)) *FeeQuoterInterface_GetTokenTransferFeeConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetValidatedFee provides a mock function with given fields: opts, destChainSelector, message
+func (_m *FeeQuoterInterface) GetValidatedFee(opts *bind.CallOpts, destChainSelector uint64, message fee_quoter.ClientEVM2AnyMessage) (*big.Int, error) {
+	ret := _m.Called(opts, destChainSelector, message)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetValidatedFee")
+	}
+
+	var r0 *big.Int
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, fee_quoter.ClientEVM2AnyMessage) (*big.Int, error)); ok {
+		return rf(opts, destChainSelector, message)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, fee_quoter.ClientEVM2AnyMessage) *big.Int); ok {
+		r0 = rf(opts, destChainSelector, message)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*big.Int)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64, fee_quoter.ClientEVM2AnyMessage) error); ok {
+		r1 = rf(opts, destChainSelector, message)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetValidatedFee_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetValidatedFee'
+type FeeQuoterInterface_GetValidatedFee_Call struct {
+	*mock.Call
+}
+
+// GetValidatedFee is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - destChainSelector uint64
+//   - message fee_quoter.ClientEVM2AnyMessage
+func (_e *FeeQuoterInterface_Expecter) GetValidatedFee(opts interface{}, destChainSelector interface{}, message interface{}) *FeeQuoterInterface_GetValidatedFee_Call {
+	return &FeeQuoterInterface_GetValidatedFee_Call{Call: _e.mock.On("GetValidatedFee", opts, destChainSelector, message)}
+}
+
+func (_c *FeeQuoterInterface_GetValidatedFee_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64, message fee_quoter.ClientEVM2AnyMessage)) *FeeQuoterInterface_GetValidatedFee_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(uint64), args[2].(fee_quoter.ClientEVM2AnyMessage))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetValidatedFee_Call) Return(_a0 *big.Int, _a1 error) *FeeQuoterInterface_GetValidatedFee_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetValidatedFee_Call) RunAndReturn(run func(*bind.CallOpts, uint64, fee_quoter.ClientEVM2AnyMessage) (*big.Int, error)) *FeeQuoterInterface_GetValidatedFee_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetValidatedTokenPrice provides a mock function with given fields: opts, token
+func (_m *FeeQuoterInterface) GetValidatedTokenPrice(opts *bind.CallOpts, token common.Address) (*big.Int, error) {
+	ret := _m.Called(opts, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetValidatedTokenPrice")
+	}
+
+	var r0 *big.Int
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (*big.Int, error)); ok {
+		return rf(opts, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) *big.Int); ok {
+		r0 = rf(opts, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*big.Int)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address) error); ok {
+		r1 = rf(opts, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_GetValidatedTokenPrice_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetValidatedTokenPrice'
+type FeeQuoterInterface_GetValidatedTokenPrice_Call struct {
+	*mock.Call
+}
+
+// GetValidatedTokenPrice is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - token common.Address
+func (_e *FeeQuoterInterface_Expecter) GetValidatedTokenPrice(opts interface{}, token interface{}) *FeeQuoterInterface_GetValidatedTokenPrice_Call {
+	return &FeeQuoterInterface_GetValidatedTokenPrice_Call{Call: _e.mock.On("GetValidatedTokenPrice", opts, token)}
+}
+
+func (_c *FeeQuoterInterface_GetValidatedTokenPrice_Call) Run(run func(opts *bind.CallOpts, token common.Address)) *FeeQuoterInterface_GetValidatedTokenPrice_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetValidatedTokenPrice_Call) Return(_a0 *big.Int, _a1 error) *FeeQuoterInterface_GetValidatedTokenPrice_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_GetValidatedTokenPrice_Call) RunAndReturn(run func(*bind.CallOpts, common.Address) (*big.Int, error)) *FeeQuoterInterface_GetValidatedTokenPrice_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// OnReport provides a mock function with given fields: opts, metadata, report
+func (_m *FeeQuoterInterface) OnReport(opts *bind.TransactOpts, metadata []byte, report []byte) (*types.Transaction, error) {
+	ret := _m.Called(opts, metadata, report)
+
+	if len(ret) == 0 {
+		panic("no return value specified for OnReport")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []byte, []byte) (*types.Transaction, error)); ok {
+		return rf(opts, metadata, report)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []byte, []byte) *types.Transaction); ok {
+		r0 = rf(opts, metadata, report)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []byte, []byte) error); ok {
+		r1 = rf(opts, metadata, report)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_OnReport_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'OnReport'
+type FeeQuoterInterface_OnReport_Call struct {
+	*mock.Call
+}
+
+// OnReport is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+//   - metadata []byte
+//   - report []byte
+func (_e *FeeQuoterInterface_Expecter) OnReport(opts interface{}, metadata interface{}, report interface{}) *FeeQuoterInterface_OnReport_Call {
+	return &FeeQuoterInterface_OnReport_Call{Call: _e.mock.On("OnReport", opts, metadata, report)}
+}
+
+func (_c *FeeQuoterInterface_OnReport_Call) Run(run func(opts *bind.TransactOpts, metadata []byte, report []byte)) *FeeQuoterInterface_OnReport_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts), args[1].([]byte), args[2].([]byte))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_OnReport_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_OnReport_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_OnReport_Call) RunAndReturn(run func(*bind.TransactOpts, []byte, []byte) (*types.Transaction, error)) *FeeQuoterInterface_OnReport_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Owner provides a mock function with given fields: opts
+func (_m *FeeQuoterInterface) Owner(opts *bind.CallOpts) (common.Address, error) {
+	ret := _m.Called(opts)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
+	var r0 common.Address
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
+		return rf(opts)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts) common.Address); ok {
+		r0 = rf(opts)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(common.Address)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts) error); ok {
+		r1 = rf(opts)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_Owner_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Owner'
+type FeeQuoterInterface_Owner_Call struct {
+	*mock.Call
+}
+
+// Owner is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+func (_e *FeeQuoterInterface_Expecter) Owner(opts interface{}) *FeeQuoterInterface_Owner_Call {
+	return &FeeQuoterInterface_Owner_Call{Call: _e.mock.On("Owner", opts)}
+}
+
+func (_c *FeeQuoterInterface_Owner_Call) Run(run func(opts *bind.CallOpts)) *FeeQuoterInterface_Owner_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_Owner_Call) Return(_a0 common.Address, _a1 error) *FeeQuoterInterface_Owner_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_Owner_Call) RunAndReturn(run func(*bind.CallOpts) (common.Address, error)) *FeeQuoterInterface_Owner_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseAuthorizedCallerAdded provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseAuthorizedCallerAdded(log types.Log) (*fee_quoter.FeeQuoterAuthorizedCallerAdded, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseAuthorizedCallerAdded")
+	}
+
+	var r0 *fee_quoter.FeeQuoterAuthorizedCallerAdded
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterAuthorizedCallerAdded, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterAuthorizedCallerAdded); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterAuthorizedCallerAdded)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseAuthorizedCallerAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseAuthorizedCallerAdded'
+type FeeQuoterInterface_ParseAuthorizedCallerAdded_Call struct {
+	*mock.Call
+}
+
+// ParseAuthorizedCallerAdded is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseAuthorizedCallerAdded(log interface{}) *FeeQuoterInterface_ParseAuthorizedCallerAdded_Call {
+	return &FeeQuoterInterface_ParseAuthorizedCallerAdded_Call{Call: _e.mock.On("ParseAuthorizedCallerAdded", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseAuthorizedCallerAdded_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseAuthorizedCallerAdded_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseAuthorizedCallerAdded_Call) Return(_a0 *fee_quoter.FeeQuoterAuthorizedCallerAdded, _a1 error) *FeeQuoterInterface_ParseAuthorizedCallerAdded_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseAuthorizedCallerAdded_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterAuthorizedCallerAdded, error)) *FeeQuoterInterface_ParseAuthorizedCallerAdded_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseAuthorizedCallerRemoved provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseAuthorizedCallerRemoved(log types.Log) (*fee_quoter.FeeQuoterAuthorizedCallerRemoved, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseAuthorizedCallerRemoved")
+	}
+
+	var r0 *fee_quoter.FeeQuoterAuthorizedCallerRemoved
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterAuthorizedCallerRemoved, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterAuthorizedCallerRemoved); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterAuthorizedCallerRemoved)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseAuthorizedCallerRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseAuthorizedCallerRemoved'
+type FeeQuoterInterface_ParseAuthorizedCallerRemoved_Call struct {
+	*mock.Call
+}
+
+// ParseAuthorizedCallerRemoved is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseAuthorizedCallerRemoved(log interface{}) *FeeQuoterInterface_ParseAuthorizedCallerRemoved_Call {
+	return &FeeQuoterInterface_ParseAuthorizedCallerRemoved_Call{Call: _e.mock.On("ParseAuthorizedCallerRemoved", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseAuthorizedCallerRemoved_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseAuthorizedCallerRemoved_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseAuthorizedCallerRemoved_Call) Return(_a0 *fee_quoter.FeeQuoterAuthorizedCallerRemoved, _a1 error) *FeeQuoterInterface_ParseAuthorizedCallerRemoved_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseAuthorizedCallerRemoved_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterAuthorizedCallerRemoved, error)) *FeeQuoterInterface_ParseAuthorizedCallerRemoved_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseDestChainAdded provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseDestChainAdded(log types.Log) (*fee_quoter.FeeQuoterDestChainAdded, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseDestChainAdded")
+	}
+
+	var r0 *fee_quoter.FeeQuoterDestChainAdded
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterDestChainAdded, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterDestChainAdded); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterDestChainAdded)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseDestChainAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseDestChainAdded'
+type FeeQuoterInterface_ParseDestChainAdded_Call struct {
+	*mock.Call
+}
+
+// ParseDestChainAdded is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseDestChainAdded(log interface{}) *FeeQuoterInterface_ParseDestChainAdded_Call {
+	return &FeeQuoterInterface_ParseDestChainAdded_Call{Call: _e.mock.On("ParseDestChainAdded", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseDestChainAdded_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseDestChainAdded_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseDestChainAdded_Call) Return(_a0 *fee_quoter.FeeQuoterDestChainAdded, _a1 error) *FeeQuoterInterface_ParseDestChainAdded_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseDestChainAdded_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterDestChainAdded, error)) *FeeQuoterInterface_ParseDestChainAdded_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseDestChainConfigUpdated provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseDestChainConfigUpdated(log types.Log) (*fee_quoter.FeeQuoterDestChainConfigUpdated, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseDestChainConfigUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterDestChainConfigUpdated
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterDestChainConfigUpdated, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterDestChainConfigUpdated); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterDestChainConfigUpdated)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseDestChainConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseDestChainConfigUpdated'
+type FeeQuoterInterface_ParseDestChainConfigUpdated_Call struct {
+	*mock.Call
+}
+
+// ParseDestChainConfigUpdated is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseDestChainConfigUpdated(log interface{}) *FeeQuoterInterface_ParseDestChainConfigUpdated_Call {
+	return &FeeQuoterInterface_ParseDestChainConfigUpdated_Call{Call: _e.mock.On("ParseDestChainConfigUpdated", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseDestChainConfigUpdated_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseDestChainConfigUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseDestChainConfigUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterDestChainConfigUpdated, _a1 error) *FeeQuoterInterface_ParseDestChainConfigUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseDestChainConfigUpdated_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterDestChainConfigUpdated, error)) *FeeQuoterInterface_ParseDestChainConfigUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseFeeTokenAdded provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseFeeTokenAdded(log types.Log) (*fee_quoter.FeeQuoterFeeTokenAdded, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseFeeTokenAdded")
+	}
+
+	var r0 *fee_quoter.FeeQuoterFeeTokenAdded
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterFeeTokenAdded, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterFeeTokenAdded); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterFeeTokenAdded)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseFeeTokenAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseFeeTokenAdded'
+type FeeQuoterInterface_ParseFeeTokenAdded_Call struct {
+	*mock.Call
+}
+
+// ParseFeeTokenAdded is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseFeeTokenAdded(log interface{}) *FeeQuoterInterface_ParseFeeTokenAdded_Call {
+	return &FeeQuoterInterface_ParseFeeTokenAdded_Call{Call: _e.mock.On("ParseFeeTokenAdded", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseFeeTokenAdded_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseFeeTokenAdded_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseFeeTokenAdded_Call) Return(_a0 *fee_quoter.FeeQuoterFeeTokenAdded, _a1 error) *FeeQuoterInterface_ParseFeeTokenAdded_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseFeeTokenAdded_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterFeeTokenAdded, error)) *FeeQuoterInterface_ParseFeeTokenAdded_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseFeeTokenRemoved provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseFeeTokenRemoved(log types.Log) (*fee_quoter.FeeQuoterFeeTokenRemoved, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseFeeTokenRemoved")
+	}
+
+	var r0 *fee_quoter.FeeQuoterFeeTokenRemoved
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterFeeTokenRemoved, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterFeeTokenRemoved); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterFeeTokenRemoved)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseFeeTokenRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseFeeTokenRemoved'
+type FeeQuoterInterface_ParseFeeTokenRemoved_Call struct {
+	*mock.Call
+}
+
+// ParseFeeTokenRemoved is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseFeeTokenRemoved(log interface{}) *FeeQuoterInterface_ParseFeeTokenRemoved_Call {
+	return &FeeQuoterInterface_ParseFeeTokenRemoved_Call{Call: _e.mock.On("ParseFeeTokenRemoved", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseFeeTokenRemoved_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseFeeTokenRemoved_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseFeeTokenRemoved_Call) Return(_a0 *fee_quoter.FeeQuoterFeeTokenRemoved, _a1 error) *FeeQuoterInterface_ParseFeeTokenRemoved_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseFeeTokenRemoved_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterFeeTokenRemoved, error)) *FeeQuoterInterface_ParseFeeTokenRemoved_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseLog provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseLog(log types.Log) (generated.AbigenLog, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
+	var r0 generated.AbigenLog
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) generated.AbigenLog); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(generated.AbigenLog)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseLog_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseLog'
+type FeeQuoterInterface_ParseLog_Call struct {
+	*mock.Call
+}
+
+// ParseLog is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseLog(log interface{}) *FeeQuoterInterface_ParseLog_Call {
+	return &FeeQuoterInterface_ParseLog_Call{Call: _e.mock.On("ParseLog", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseLog_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseLog_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseLog_Call) Return(_a0 generated.AbigenLog, _a1 error) *FeeQuoterInterface_ParseLog_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseLog_Call) RunAndReturn(run func(types.Log) (generated.AbigenLog, error)) *FeeQuoterInterface_ParseLog_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseOwnershipTransferRequested provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseOwnershipTransferRequested(log types.Log) (*fee_quoter.FeeQuoterOwnershipTransferRequested, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
+	var r0 *fee_quoter.FeeQuoterOwnershipTransferRequested
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterOwnershipTransferRequested, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterOwnershipTransferRequested); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterOwnershipTransferRequested)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseOwnershipTransferRequested_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseOwnershipTransferRequested'
+type FeeQuoterInterface_ParseOwnershipTransferRequested_Call struct {
+	*mock.Call
+}
+
+// ParseOwnershipTransferRequested is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseOwnershipTransferRequested(log interface{}) *FeeQuoterInterface_ParseOwnershipTransferRequested_Call {
+	return &FeeQuoterInterface_ParseOwnershipTransferRequested_Call{Call: _e.mock.On("ParseOwnershipTransferRequested", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseOwnershipTransferRequested_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseOwnershipTransferRequested_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseOwnershipTransferRequested_Call) Return(_a0 *fee_quoter.FeeQuoterOwnershipTransferRequested, _a1 error) *FeeQuoterInterface_ParseOwnershipTransferRequested_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseOwnershipTransferRequested_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterOwnershipTransferRequested, error)) *FeeQuoterInterface_ParseOwnershipTransferRequested_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseOwnershipTransferred provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseOwnershipTransferred(log types.Log) (*fee_quoter.FeeQuoterOwnershipTransferred, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
+	var r0 *fee_quoter.FeeQuoterOwnershipTransferred
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterOwnershipTransferred, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterOwnershipTransferred); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterOwnershipTransferred)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseOwnershipTransferred_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseOwnershipTransferred'
+type FeeQuoterInterface_ParseOwnershipTransferred_Call struct {
+	*mock.Call
+}
+
+// ParseOwnershipTransferred is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseOwnershipTransferred(log interface{}) *FeeQuoterInterface_ParseOwnershipTransferred_Call {
+	return &FeeQuoterInterface_ParseOwnershipTransferred_Call{Call: _e.mock.On("ParseOwnershipTransferred", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseOwnershipTransferred_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseOwnershipTransferred_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseOwnershipTransferred_Call) Return(_a0 *fee_quoter.FeeQuoterOwnershipTransferred, _a1 error) *FeeQuoterInterface_ParseOwnershipTransferred_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseOwnershipTransferred_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterOwnershipTransferred, error)) *FeeQuoterInterface_ParseOwnershipTransferred_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParsePremiumMultiplierWeiPerEthUpdated provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParsePremiumMultiplierWeiPerEthUpdated(log types.Log) (*fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParsePremiumMultiplierWeiPerEthUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParsePremiumMultiplierWeiPerEthUpdated'
+type FeeQuoterInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call struct {
+	*mock.Call
+}
+
+// ParsePremiumMultiplierWeiPerEthUpdated is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParsePremiumMultiplierWeiPerEthUpdated(log interface{}) *FeeQuoterInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call {
+	return &FeeQuoterInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call{Call: _e.mock.On("ParsePremiumMultiplierWeiPerEthUpdated", log)}
+}
+
+func (_c *FeeQuoterInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated, _a1 error) *FeeQuoterInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated, error)) *FeeQuoterInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParsePriceFeedPerTokenUpdated provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParsePriceFeedPerTokenUpdated(log types.Log) (*fee_quoter.FeeQuoterPriceFeedPerTokenUpdated, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParsePriceFeedPerTokenUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterPriceFeedPerTokenUpdated, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterPriceFeedPerTokenUpdated)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParsePriceFeedPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParsePriceFeedPerTokenUpdated'
+type FeeQuoterInterface_ParsePriceFeedPerTokenUpdated_Call struct {
+	*mock.Call
+}
+
+// ParsePriceFeedPerTokenUpdated is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParsePriceFeedPerTokenUpdated(log interface{}) *FeeQuoterInterface_ParsePriceFeedPerTokenUpdated_Call {
+	return &FeeQuoterInterface_ParsePriceFeedPerTokenUpdated_Call{Call: _e.mock.On("ParsePriceFeedPerTokenUpdated", log)}
+}
+
+func (_c *FeeQuoterInterface_ParsePriceFeedPerTokenUpdated_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParsePriceFeedPerTokenUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParsePriceFeedPerTokenUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated, _a1 error) *FeeQuoterInterface_ParsePriceFeedPerTokenUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParsePriceFeedPerTokenUpdated_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterPriceFeedPerTokenUpdated, error)) *FeeQuoterInterface_ParsePriceFeedPerTokenUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseReportPermissionSet provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseReportPermissionSet(log types.Log) (*fee_quoter.FeeQuoterReportPermissionSet, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseReportPermissionSet")
+	}
+
+	var r0 *fee_quoter.FeeQuoterReportPermissionSet
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterReportPermissionSet, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterReportPermissionSet); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterReportPermissionSet)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseReportPermissionSet_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseReportPermissionSet'
+type FeeQuoterInterface_ParseReportPermissionSet_Call struct {
+	*mock.Call
+}
+
+// ParseReportPermissionSet is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseReportPermissionSet(log interface{}) *FeeQuoterInterface_ParseReportPermissionSet_Call {
+	return &FeeQuoterInterface_ParseReportPermissionSet_Call{Call: _e.mock.On("ParseReportPermissionSet", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseReportPermissionSet_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseReportPermissionSet_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseReportPermissionSet_Call) Return(_a0 *fee_quoter.FeeQuoterReportPermissionSet, _a1 error) *FeeQuoterInterface_ParseReportPermissionSet_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseReportPermissionSet_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterReportPermissionSet, error)) *FeeQuoterInterface_ParseReportPermissionSet_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseTokenTransferFeeConfigDeleted provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseTokenTransferFeeConfigDeleted(log types.Log) (*fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseTokenTransferFeeConfigDeleted")
+	}
+
+	var r0 *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseTokenTransferFeeConfigDeleted_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseTokenTransferFeeConfigDeleted'
+type FeeQuoterInterface_ParseTokenTransferFeeConfigDeleted_Call struct {
+	*mock.Call
+}
+
+// ParseTokenTransferFeeConfigDeleted is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseTokenTransferFeeConfigDeleted(log interface{}) *FeeQuoterInterface_ParseTokenTransferFeeConfigDeleted_Call {
+	return &FeeQuoterInterface_ParseTokenTransferFeeConfigDeleted_Call{Call: _e.mock.On("ParseTokenTransferFeeConfigDeleted", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseTokenTransferFeeConfigDeleted_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseTokenTransferFeeConfigDeleted_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseTokenTransferFeeConfigDeleted_Call) Return(_a0 *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted, _a1 error) *FeeQuoterInterface_ParseTokenTransferFeeConfigDeleted_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseTokenTransferFeeConfigDeleted_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted, error)) *FeeQuoterInterface_ParseTokenTransferFeeConfigDeleted_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseTokenTransferFeeConfigUpdated provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseTokenTransferFeeConfigUpdated(log types.Log) (*fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseTokenTransferFeeConfigUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseTokenTransferFeeConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseTokenTransferFeeConfigUpdated'
+type FeeQuoterInterface_ParseTokenTransferFeeConfigUpdated_Call struct {
+	*mock.Call
+}
+
+// ParseTokenTransferFeeConfigUpdated is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseTokenTransferFeeConfigUpdated(log interface{}) *FeeQuoterInterface_ParseTokenTransferFeeConfigUpdated_Call {
+	return &FeeQuoterInterface_ParseTokenTransferFeeConfigUpdated_Call{Call: _e.mock.On("ParseTokenTransferFeeConfigUpdated", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseTokenTransferFeeConfigUpdated_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseTokenTransferFeeConfigUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseTokenTransferFeeConfigUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated, _a1 error) *FeeQuoterInterface_ParseTokenTransferFeeConfigUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseTokenTransferFeeConfigUpdated_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated, error)) *FeeQuoterInterface_ParseTokenTransferFeeConfigUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseUsdPerTokenUpdated provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseUsdPerTokenUpdated(log types.Log) (*fee_quoter.FeeQuoterUsdPerTokenUpdated, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseUsdPerTokenUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterUsdPerTokenUpdated
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterUsdPerTokenUpdated, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterUsdPerTokenUpdated); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterUsdPerTokenUpdated)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseUsdPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseUsdPerTokenUpdated'
+type FeeQuoterInterface_ParseUsdPerTokenUpdated_Call struct {
+	*mock.Call
+}
+
+// ParseUsdPerTokenUpdated is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseUsdPerTokenUpdated(log interface{}) *FeeQuoterInterface_ParseUsdPerTokenUpdated_Call {
+	return &FeeQuoterInterface_ParseUsdPerTokenUpdated_Call{Call: _e.mock.On("ParseUsdPerTokenUpdated", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseUsdPerTokenUpdated_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseUsdPerTokenUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseUsdPerTokenUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterUsdPerTokenUpdated, _a1 error) *FeeQuoterInterface_ParseUsdPerTokenUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseUsdPerTokenUpdated_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterUsdPerTokenUpdated, error)) *FeeQuoterInterface_ParseUsdPerTokenUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ParseUsdPerUnitGasUpdated provides a mock function with given fields: log
+func (_m *FeeQuoterInterface) ParseUsdPerUnitGasUpdated(log types.Log) (*fee_quoter.FeeQuoterUsdPerUnitGasUpdated, error) {
+	ret := _m.Called(log)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ParseUsdPerUnitGasUpdated")
+	}
+
+	var r0 *fee_quoter.FeeQuoterUsdPerUnitGasUpdated
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Log) (*fee_quoter.FeeQuoterUsdPerUnitGasUpdated, error)); ok {
+		return rf(log)
+	}
+	if rf, ok := ret.Get(0).(func(types.Log) *fee_quoter.FeeQuoterUsdPerUnitGasUpdated); ok {
+		r0 = rf(log)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*fee_quoter.FeeQuoterUsdPerUnitGasUpdated)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
+		r1 = rf(log)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ParseUsdPerUnitGasUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseUsdPerUnitGasUpdated'
+type FeeQuoterInterface_ParseUsdPerUnitGasUpdated_Call struct {
+	*mock.Call
+}
+
+// ParseUsdPerUnitGasUpdated is a helper method to define mock.On call
+//   - log types.Log
+func (_e *FeeQuoterInterface_Expecter) ParseUsdPerUnitGasUpdated(log interface{}) *FeeQuoterInterface_ParseUsdPerUnitGasUpdated_Call {
+	return &FeeQuoterInterface_ParseUsdPerUnitGasUpdated_Call{Call: _e.mock.On("ParseUsdPerUnitGasUpdated", log)}
+}
+
+func (_c *FeeQuoterInterface_ParseUsdPerUnitGasUpdated_Call) Run(run func(log types.Log)) *FeeQuoterInterface_ParseUsdPerUnitGasUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(types.Log))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseUsdPerUnitGasUpdated_Call) Return(_a0 *fee_quoter.FeeQuoterUsdPerUnitGasUpdated, _a1 error) *FeeQuoterInterface_ParseUsdPerUnitGasUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ParseUsdPerUnitGasUpdated_Call) RunAndReturn(run func(types.Log) (*fee_quoter.FeeQuoterUsdPerUnitGasUpdated, error)) *FeeQuoterInterface_ParseUsdPerUnitGasUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ProcessMessageArgs provides a mock function with given fields: opts, destChainSelector, feeToken, feeTokenAmount, extraArgs
+func (_m *FeeQuoterInterface) ProcessMessageArgs(opts *bind.CallOpts, destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte) (fee_quoter.ProcessMessageArgs, error) {
+	ret := _m.Called(opts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ProcessMessageArgs")
+	}
+
+	var r0 fee_quoter.ProcessMessageArgs
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, common.Address, *big.Int, []byte) (fee_quoter.ProcessMessageArgs, error)); ok {
+		return rf(opts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, common.Address, *big.Int, []byte) fee_quoter.ProcessMessageArgs); ok {
+		r0 = rf(opts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
+	} else {
+		r0 = ret.Get(0).(fee_quoter.ProcessMessageArgs)
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64, common.Address, *big.Int, []byte) error); ok {
+		r1 = rf(opts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ProcessMessageArgs_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ProcessMessageArgs'
+type FeeQuoterInterface_ProcessMessageArgs_Call struct {
+	*mock.Call
+}
+
+// ProcessMessageArgs is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - destChainSelector uint64
+//   - feeToken common.Address
+//   - feeTokenAmount *big.Int
+//   - extraArgs []byte
+func (_e *FeeQuoterInterface_Expecter) ProcessMessageArgs(opts interface{}, destChainSelector interface{}, feeToken interface{}, feeTokenAmount interface{}, extraArgs interface{}) *FeeQuoterInterface_ProcessMessageArgs_Call {
+	return &FeeQuoterInterface_ProcessMessageArgs_Call{Call: _e.mock.On("ProcessMessageArgs", opts, destChainSelector, feeToken, feeTokenAmount, extraArgs)}
+}
+
+func (_c *FeeQuoterInterface_ProcessMessageArgs_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte)) *FeeQuoterInterface_ProcessMessageArgs_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(uint64), args[2].(common.Address), args[3].(*big.Int), args[4].([]byte))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ProcessMessageArgs_Call) Return(_a0 fee_quoter.ProcessMessageArgs, _a1 error) *FeeQuoterInterface_ProcessMessageArgs_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ProcessMessageArgs_Call) RunAndReturn(run func(*bind.CallOpts, uint64, common.Address, *big.Int, []byte) (fee_quoter.ProcessMessageArgs, error)) *FeeQuoterInterface_ProcessMessageArgs_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ProcessPoolReturnData provides a mock function with given fields: opts, destChainSelector, rampTokenAmounts, sourceTokenAmounts
+func (_m *FeeQuoterInterface) ProcessPoolReturnData(opts *bind.CallOpts, destChainSelector uint64, rampTokenAmounts []fee_quoter.InternalRampTokenAmount, sourceTokenAmounts []fee_quoter.ClientEVMTokenAmount) ([][]byte, error) {
+	ret := _m.Called(opts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ProcessPoolReturnData")
+	}
+
+	var r0 [][]byte
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, []fee_quoter.InternalRampTokenAmount, []fee_quoter.ClientEVMTokenAmount) ([][]byte, error)); ok {
+		return rf(opts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, []fee_quoter.InternalRampTokenAmount, []fee_quoter.ClientEVMTokenAmount) [][]byte); ok {
+		r0 = rf(opts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([][]byte)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64, []fee_quoter.InternalRampTokenAmount, []fee_quoter.ClientEVMTokenAmount) error); ok {
+		r1 = rf(opts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_ProcessPoolReturnData_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ProcessPoolReturnData'
+type FeeQuoterInterface_ProcessPoolReturnData_Call struct {
+	*mock.Call
+}
+
+// ProcessPoolReturnData is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+//   - destChainSelector uint64
+//   - rampTokenAmounts []fee_quoter.InternalRampTokenAmount
+//   - sourceTokenAmounts []fee_quoter.ClientEVMTokenAmount
+func (_e *FeeQuoterInterface_Expecter) ProcessPoolReturnData(opts interface{}, destChainSelector interface{}, rampTokenAmounts interface{}, sourceTokenAmounts interface{}) *FeeQuoterInterface_ProcessPoolReturnData_Call {
+	return &FeeQuoterInterface_ProcessPoolReturnData_Call{Call: _e.mock.On("ProcessPoolReturnData", opts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)}
+}
+
+func (_c *FeeQuoterInterface_ProcessPoolReturnData_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64, rampTokenAmounts []fee_quoter.InternalRampTokenAmount, sourceTokenAmounts []fee_quoter.ClientEVMTokenAmount)) *FeeQuoterInterface_ProcessPoolReturnData_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts), args[1].(uint64), args[2].([]fee_quoter.InternalRampTokenAmount), args[3].([]fee_quoter.ClientEVMTokenAmount))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ProcessPoolReturnData_Call) Return(_a0 [][]byte, _a1 error) *FeeQuoterInterface_ProcessPoolReturnData_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_ProcessPoolReturnData_Call) RunAndReturn(run func(*bind.CallOpts, uint64, []fee_quoter.InternalRampTokenAmount, []fee_quoter.ClientEVMTokenAmount) ([][]byte, error)) *FeeQuoterInterface_ProcessPoolReturnData_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// SetReportPermissions provides a mock function with given fields: opts, permissions
+func (_m *FeeQuoterInterface) SetReportPermissions(opts *bind.TransactOpts, permissions []fee_quoter.KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error) {
+	ret := _m.Called(opts, permissions)
+
+	if len(ret) == 0 {
+		panic("no return value specified for SetReportPermissions")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []fee_quoter.KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error)); ok {
+		return rf(opts, permissions)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []fee_quoter.KeystoneFeedsPermissionHandlerPermission) *types.Transaction); ok {
+		r0 = rf(opts, permissions)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []fee_quoter.KeystoneFeedsPermissionHandlerPermission) error); ok {
+		r1 = rf(opts, permissions)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_SetReportPermissions_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetReportPermissions'
+type FeeQuoterInterface_SetReportPermissions_Call struct {
+	*mock.Call
+}
+
+// SetReportPermissions is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+//   - permissions []fee_quoter.KeystoneFeedsPermissionHandlerPermission
+func (_e *FeeQuoterInterface_Expecter) SetReportPermissions(opts interface{}, permissions interface{}) *FeeQuoterInterface_SetReportPermissions_Call {
+	return &FeeQuoterInterface_SetReportPermissions_Call{Call: _e.mock.On("SetReportPermissions", opts, permissions)}
+}
+
+func (_c *FeeQuoterInterface_SetReportPermissions_Call) Run(run func(opts *bind.TransactOpts, permissions []fee_quoter.KeystoneFeedsPermissionHandlerPermission)) *FeeQuoterInterface_SetReportPermissions_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts), args[1].([]fee_quoter.KeystoneFeedsPermissionHandlerPermission))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_SetReportPermissions_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_SetReportPermissions_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_SetReportPermissions_Call) RunAndReturn(run func(*bind.TransactOpts, []fee_quoter.KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error)) *FeeQuoterInterface_SetReportPermissions_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// TransferOwnership provides a mock function with given fields: opts, to
+func (_m *FeeQuoterInterface) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
+	ret := _m.Called(opts, to)
+
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
+		return rf(opts, to)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) *types.Transaction); ok {
+		r0 = rf(opts, to)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, common.Address) error); ok {
+		r1 = rf(opts, to)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_TransferOwnership_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'TransferOwnership'
+type FeeQuoterInterface_TransferOwnership_Call struct {
+	*mock.Call
+}
+
+// TransferOwnership is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+//   - to common.Address
+func (_e *FeeQuoterInterface_Expecter) TransferOwnership(opts interface{}, to interface{}) *FeeQuoterInterface_TransferOwnership_Call {
+	return &FeeQuoterInterface_TransferOwnership_Call{Call: _e.mock.On("TransferOwnership", opts, to)}
+}
+
+func (_c *FeeQuoterInterface_TransferOwnership_Call) Run(run func(opts *bind.TransactOpts, to common.Address)) *FeeQuoterInterface_TransferOwnership_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts), args[1].(common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_TransferOwnership_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_TransferOwnership_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_TransferOwnership_Call) RunAndReturn(run func(*bind.TransactOpts, common.Address) (*types.Transaction, error)) *FeeQuoterInterface_TransferOwnership_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// TypeAndVersion provides a mock function with given fields: opts
+func (_m *FeeQuoterInterface) TypeAndVersion(opts *bind.CallOpts) (string, error) {
+	ret := _m.Called(opts)
+
+	if len(ret) == 0 {
+		panic("no return value specified for TypeAndVersion")
+	}
+
+	var r0 string
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (string, error)); ok {
+		return rf(opts)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.CallOpts) string); ok {
+		r0 = rf(opts)
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.CallOpts) error); ok {
+		r1 = rf(opts)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_TypeAndVersion_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'TypeAndVersion'
+type FeeQuoterInterface_TypeAndVersion_Call struct {
+	*mock.Call
+}
+
+// TypeAndVersion is a helper method to define mock.On call
+//   - opts *bind.CallOpts
+func (_e *FeeQuoterInterface_Expecter) TypeAndVersion(opts interface{}) *FeeQuoterInterface_TypeAndVersion_Call {
+	return &FeeQuoterInterface_TypeAndVersion_Call{Call: _e.mock.On("TypeAndVersion", opts)}
+}
+
+func (_c *FeeQuoterInterface_TypeAndVersion_Call) Run(run func(opts *bind.CallOpts)) *FeeQuoterInterface_TypeAndVersion_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.CallOpts))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_TypeAndVersion_Call) Return(_a0 string, _a1 error) *FeeQuoterInterface_TypeAndVersion_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_TypeAndVersion_Call) RunAndReturn(run func(*bind.CallOpts) (string, error)) *FeeQuoterInterface_TypeAndVersion_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// UpdatePrices provides a mock function with given fields: opts, priceUpdates
+func (_m *FeeQuoterInterface) UpdatePrices(opts *bind.TransactOpts, priceUpdates fee_quoter.InternalPriceUpdates) (*types.Transaction, error) {
+	ret := _m.Called(opts, priceUpdates)
+
+	if len(ret) == 0 {
+		panic("no return value specified for UpdatePrices")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, fee_quoter.InternalPriceUpdates) (*types.Transaction, error)); ok {
+		return rf(opts, priceUpdates)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, fee_quoter.InternalPriceUpdates) *types.Transaction); ok {
+		r0 = rf(opts, priceUpdates)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, fee_quoter.InternalPriceUpdates) error); ok {
+		r1 = rf(opts, priceUpdates)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_UpdatePrices_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdatePrices'
+type FeeQuoterInterface_UpdatePrices_Call struct {
+	*mock.Call
+}
+
+// UpdatePrices is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+//   - priceUpdates fee_quoter.InternalPriceUpdates
+func (_e *FeeQuoterInterface_Expecter) UpdatePrices(opts interface{}, priceUpdates interface{}) *FeeQuoterInterface_UpdatePrices_Call {
+	return &FeeQuoterInterface_UpdatePrices_Call{Call: _e.mock.On("UpdatePrices", opts, priceUpdates)}
+}
+
+func (_c *FeeQuoterInterface_UpdatePrices_Call) Run(run func(opts *bind.TransactOpts, priceUpdates fee_quoter.InternalPriceUpdates)) *FeeQuoterInterface_UpdatePrices_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts), args[1].(fee_quoter.InternalPriceUpdates))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_UpdatePrices_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_UpdatePrices_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_UpdatePrices_Call) RunAndReturn(run func(*bind.TransactOpts, fee_quoter.InternalPriceUpdates) (*types.Transaction, error)) *FeeQuoterInterface_UpdatePrices_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// UpdateTokenPriceFeeds provides a mock function with given fields: opts, tokenPriceFeedUpdates
+func (_m *FeeQuoterInterface) UpdateTokenPriceFeeds(opts *bind.TransactOpts, tokenPriceFeedUpdates []fee_quoter.FeeQuoterTokenPriceFeedUpdate) (*types.Transaction, error) {
+	ret := _m.Called(opts, tokenPriceFeedUpdates)
+
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTokenPriceFeeds")
+	}
+
+	var r0 *types.Transaction
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterTokenPriceFeedUpdate) (*types.Transaction, error)); ok {
+		return rf(opts, tokenPriceFeedUpdates)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterTokenPriceFeedUpdate) *types.Transaction); ok {
+		r0 = rf(opts, tokenPriceFeedUpdates)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Transaction)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []fee_quoter.FeeQuoterTokenPriceFeedUpdate) error); ok {
+		r1 = rf(opts, tokenPriceFeedUpdates)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_UpdateTokenPriceFeeds_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdateTokenPriceFeeds'
+type FeeQuoterInterface_UpdateTokenPriceFeeds_Call struct {
+	*mock.Call
+}
+
+// UpdateTokenPriceFeeds is a helper method to define mock.On call
+//   - opts *bind.TransactOpts
+//   - tokenPriceFeedUpdates []fee_quoter.FeeQuoterTokenPriceFeedUpdate
+func (_e *FeeQuoterInterface_Expecter) UpdateTokenPriceFeeds(opts interface{}, tokenPriceFeedUpdates interface{}) *FeeQuoterInterface_UpdateTokenPriceFeeds_Call {
+	return &FeeQuoterInterface_UpdateTokenPriceFeeds_Call{Call: _e.mock.On("UpdateTokenPriceFeeds", opts, tokenPriceFeedUpdates)}
+}
+
+func (_c *FeeQuoterInterface_UpdateTokenPriceFeeds_Call) Run(run func(opts *bind.TransactOpts, tokenPriceFeedUpdates []fee_quoter.FeeQuoterTokenPriceFeedUpdate)) *FeeQuoterInterface_UpdateTokenPriceFeeds_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.TransactOpts), args[1].([]fee_quoter.FeeQuoterTokenPriceFeedUpdate))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_UpdateTokenPriceFeeds_Call) Return(_a0 *types.Transaction, _a1 error) *FeeQuoterInterface_UpdateTokenPriceFeeds_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_UpdateTokenPriceFeeds_Call) RunAndReturn(run func(*bind.TransactOpts, []fee_quoter.FeeQuoterTokenPriceFeedUpdate) (*types.Transaction, error)) *FeeQuoterInterface_UpdateTokenPriceFeeds_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchAuthorizedCallerAdded provides a mock function with given fields: opts, sink
+func (_m *FeeQuoterInterface) WatchAuthorizedCallerAdded(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterAuthorizedCallerAdded) (event.Subscription, error) {
+	ret := _m.Called(opts, sink)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchAuthorizedCallerAdded")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterAuthorizedCallerAdded) (event.Subscription, error)); ok {
+		return rf(opts, sink)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterAuthorizedCallerAdded) event.Subscription); ok {
+		r0 = rf(opts, sink)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterAuthorizedCallerAdded) error); ok {
+		r1 = rf(opts, sink)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchAuthorizedCallerAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchAuthorizedCallerAdded'
+type FeeQuoterInterface_WatchAuthorizedCallerAdded_Call struct {
+	*mock.Call
+}
+
+// WatchAuthorizedCallerAdded is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterAuthorizedCallerAdded
+func (_e *FeeQuoterInterface_Expecter) WatchAuthorizedCallerAdded(opts interface{}, sink interface{}) *FeeQuoterInterface_WatchAuthorizedCallerAdded_Call {
+	return &FeeQuoterInterface_WatchAuthorizedCallerAdded_Call{Call: _e.mock.On("WatchAuthorizedCallerAdded", opts, sink)}
+}
+
+func (_c *FeeQuoterInterface_WatchAuthorizedCallerAdded_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterAuthorizedCallerAdded)) *FeeQuoterInterface_WatchAuthorizedCallerAdded_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterAuthorizedCallerAdded))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchAuthorizedCallerAdded_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchAuthorizedCallerAdded_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchAuthorizedCallerAdded_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterAuthorizedCallerAdded) (event.Subscription, error)) *FeeQuoterInterface_WatchAuthorizedCallerAdded_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchAuthorizedCallerRemoved provides a mock function with given fields: opts, sink
+func (_m *FeeQuoterInterface) WatchAuthorizedCallerRemoved(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterAuthorizedCallerRemoved) (event.Subscription, error) {
+	ret := _m.Called(opts, sink)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchAuthorizedCallerRemoved")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterAuthorizedCallerRemoved) (event.Subscription, error)); ok {
+		return rf(opts, sink)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterAuthorizedCallerRemoved) event.Subscription); ok {
+		r0 = rf(opts, sink)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterAuthorizedCallerRemoved) error); ok {
+		r1 = rf(opts, sink)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchAuthorizedCallerRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchAuthorizedCallerRemoved'
+type FeeQuoterInterface_WatchAuthorizedCallerRemoved_Call struct {
+	*mock.Call
+}
+
+// WatchAuthorizedCallerRemoved is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterAuthorizedCallerRemoved
+func (_e *FeeQuoterInterface_Expecter) WatchAuthorizedCallerRemoved(opts interface{}, sink interface{}) *FeeQuoterInterface_WatchAuthorizedCallerRemoved_Call {
+	return &FeeQuoterInterface_WatchAuthorizedCallerRemoved_Call{Call: _e.mock.On("WatchAuthorizedCallerRemoved", opts, sink)}
+}
+
+func (_c *FeeQuoterInterface_WatchAuthorizedCallerRemoved_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterAuthorizedCallerRemoved)) *FeeQuoterInterface_WatchAuthorizedCallerRemoved_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterAuthorizedCallerRemoved))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchAuthorizedCallerRemoved_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchAuthorizedCallerRemoved_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchAuthorizedCallerRemoved_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterAuthorizedCallerRemoved) (event.Subscription, error)) *FeeQuoterInterface_WatchAuthorizedCallerRemoved_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchDestChainAdded provides a mock function with given fields: opts, sink, destChainSelector
+func (_m *FeeQuoterInterface) WatchDestChainAdded(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterDestChainAdded, destChainSelector []uint64) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, destChainSelector)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchDestChainAdded")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterDestChainAdded, []uint64) (event.Subscription, error)); ok {
+		return rf(opts, sink, destChainSelector)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterDestChainAdded, []uint64) event.Subscription); ok {
+		r0 = rf(opts, sink, destChainSelector)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterDestChainAdded, []uint64) error); ok {
+		r1 = rf(opts, sink, destChainSelector)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchDestChainAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchDestChainAdded'
+type FeeQuoterInterface_WatchDestChainAdded_Call struct {
+	*mock.Call
+}
+
+// WatchDestChainAdded is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterDestChainAdded
+//   - destChainSelector []uint64
+func (_e *FeeQuoterInterface_Expecter) WatchDestChainAdded(opts interface{}, sink interface{}, destChainSelector interface{}) *FeeQuoterInterface_WatchDestChainAdded_Call {
+	return &FeeQuoterInterface_WatchDestChainAdded_Call{Call: _e.mock.On("WatchDestChainAdded", opts, sink, destChainSelector)}
+}
+
+func (_c *FeeQuoterInterface_WatchDestChainAdded_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterDestChainAdded, destChainSelector []uint64)) *FeeQuoterInterface_WatchDestChainAdded_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterDestChainAdded), args[2].([]uint64))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchDestChainAdded_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchDestChainAdded_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchDestChainAdded_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterDestChainAdded, []uint64) (event.Subscription, error)) *FeeQuoterInterface_WatchDestChainAdded_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchDestChainConfigUpdated provides a mock function with given fields: opts, sink, destChainSelector
+func (_m *FeeQuoterInterface) WatchDestChainConfigUpdated(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterDestChainConfigUpdated, destChainSelector []uint64) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, destChainSelector)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchDestChainConfigUpdated")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterDestChainConfigUpdated, []uint64) (event.Subscription, error)); ok {
+		return rf(opts, sink, destChainSelector)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterDestChainConfigUpdated, []uint64) event.Subscription); ok {
+		r0 = rf(opts, sink, destChainSelector)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterDestChainConfigUpdated, []uint64) error); ok {
+		r1 = rf(opts, sink, destChainSelector)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchDestChainConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchDestChainConfigUpdated'
+type FeeQuoterInterface_WatchDestChainConfigUpdated_Call struct {
+	*mock.Call
+}
+
+// WatchDestChainConfigUpdated is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterDestChainConfigUpdated
+//   - destChainSelector []uint64
+func (_e *FeeQuoterInterface_Expecter) WatchDestChainConfigUpdated(opts interface{}, sink interface{}, destChainSelector interface{}) *FeeQuoterInterface_WatchDestChainConfigUpdated_Call {
+	return &FeeQuoterInterface_WatchDestChainConfigUpdated_Call{Call: _e.mock.On("WatchDestChainConfigUpdated", opts, sink, destChainSelector)}
+}
+
+func (_c *FeeQuoterInterface_WatchDestChainConfigUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterDestChainConfigUpdated, destChainSelector []uint64)) *FeeQuoterInterface_WatchDestChainConfigUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterDestChainConfigUpdated), args[2].([]uint64))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchDestChainConfigUpdated_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchDestChainConfigUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchDestChainConfigUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterDestChainConfigUpdated, []uint64) (event.Subscription, error)) *FeeQuoterInterface_WatchDestChainConfigUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchFeeTokenAdded provides a mock function with given fields: opts, sink, feeToken
+func (_m *FeeQuoterInterface) WatchFeeTokenAdded(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterFeeTokenAdded, feeToken []common.Address) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, feeToken)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchFeeTokenAdded")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterFeeTokenAdded, []common.Address) (event.Subscription, error)); ok {
+		return rf(opts, sink, feeToken)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterFeeTokenAdded, []common.Address) event.Subscription); ok {
+		r0 = rf(opts, sink, feeToken)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterFeeTokenAdded, []common.Address) error); ok {
+		r1 = rf(opts, sink, feeToken)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchFeeTokenAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchFeeTokenAdded'
+type FeeQuoterInterface_WatchFeeTokenAdded_Call struct {
+	*mock.Call
+}
+
+// WatchFeeTokenAdded is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterFeeTokenAdded
+//   - feeToken []common.Address
+func (_e *FeeQuoterInterface_Expecter) WatchFeeTokenAdded(opts interface{}, sink interface{}, feeToken interface{}) *FeeQuoterInterface_WatchFeeTokenAdded_Call {
+	return &FeeQuoterInterface_WatchFeeTokenAdded_Call{Call: _e.mock.On("WatchFeeTokenAdded", opts, sink, feeToken)}
+}
+
+func (_c *FeeQuoterInterface_WatchFeeTokenAdded_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterFeeTokenAdded, feeToken []common.Address)) *FeeQuoterInterface_WatchFeeTokenAdded_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterFeeTokenAdded), args[2].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchFeeTokenAdded_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchFeeTokenAdded_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchFeeTokenAdded_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterFeeTokenAdded, []common.Address) (event.Subscription, error)) *FeeQuoterInterface_WatchFeeTokenAdded_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchFeeTokenRemoved provides a mock function with given fields: opts, sink, feeToken
+func (_m *FeeQuoterInterface) WatchFeeTokenRemoved(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterFeeTokenRemoved, feeToken []common.Address) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, feeToken)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchFeeTokenRemoved")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterFeeTokenRemoved, []common.Address) (event.Subscription, error)); ok {
+		return rf(opts, sink, feeToken)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterFeeTokenRemoved, []common.Address) event.Subscription); ok {
+		r0 = rf(opts, sink, feeToken)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterFeeTokenRemoved, []common.Address) error); ok {
+		r1 = rf(opts, sink, feeToken)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchFeeTokenRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchFeeTokenRemoved'
+type FeeQuoterInterface_WatchFeeTokenRemoved_Call struct {
+	*mock.Call
+}
+
+// WatchFeeTokenRemoved is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterFeeTokenRemoved
+//   - feeToken []common.Address
+func (_e *FeeQuoterInterface_Expecter) WatchFeeTokenRemoved(opts interface{}, sink interface{}, feeToken interface{}) *FeeQuoterInterface_WatchFeeTokenRemoved_Call {
+	return &FeeQuoterInterface_WatchFeeTokenRemoved_Call{Call: _e.mock.On("WatchFeeTokenRemoved", opts, sink, feeToken)}
+}
+
+func (_c *FeeQuoterInterface_WatchFeeTokenRemoved_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterFeeTokenRemoved, feeToken []common.Address)) *FeeQuoterInterface_WatchFeeTokenRemoved_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterFeeTokenRemoved), args[2].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchFeeTokenRemoved_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchFeeTokenRemoved_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchFeeTokenRemoved_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterFeeTokenRemoved, []common.Address) (event.Subscription, error)) *FeeQuoterInterface_WatchFeeTokenRemoved_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchOwnershipTransferRequested provides a mock function with given fields: opts, sink, from, to
+func (_m *FeeQuoterInterface) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, from, to)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
+		return rf(opts, sink, from, to)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterOwnershipTransferRequested, []common.Address, []common.Address) event.Subscription); ok {
+		r0 = rf(opts, sink, from, to)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterOwnershipTransferRequested, []common.Address, []common.Address) error); ok {
+		r1 = rf(opts, sink, from, to)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchOwnershipTransferRequested_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchOwnershipTransferRequested'
+type FeeQuoterInterface_WatchOwnershipTransferRequested_Call struct {
+	*mock.Call
+}
+
+// WatchOwnershipTransferRequested is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterOwnershipTransferRequested
+//   - from []common.Address
+//   - to []common.Address
+func (_e *FeeQuoterInterface_Expecter) WatchOwnershipTransferRequested(opts interface{}, sink interface{}, from interface{}, to interface{}) *FeeQuoterInterface_WatchOwnershipTransferRequested_Call {
+	return &FeeQuoterInterface_WatchOwnershipTransferRequested_Call{Call: _e.mock.On("WatchOwnershipTransferRequested", opts, sink, from, to)}
+}
+
+func (_c *FeeQuoterInterface_WatchOwnershipTransferRequested_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterOwnershipTransferRequested, from []common.Address, to []common.Address)) *FeeQuoterInterface_WatchOwnershipTransferRequested_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterOwnershipTransferRequested), args[2].([]common.Address), args[3].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchOwnershipTransferRequested_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchOwnershipTransferRequested_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchOwnershipTransferRequested_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)) *FeeQuoterInterface_WatchOwnershipTransferRequested_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchOwnershipTransferred provides a mock function with given fields: opts, sink, from, to
+func (_m *FeeQuoterInterface) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, from, to)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
+		return rf(opts, sink, from, to)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterOwnershipTransferred, []common.Address, []common.Address) event.Subscription); ok {
+		r0 = rf(opts, sink, from, to)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterOwnershipTransferred, []common.Address, []common.Address) error); ok {
+		r1 = rf(opts, sink, from, to)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchOwnershipTransferred_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchOwnershipTransferred'
+type FeeQuoterInterface_WatchOwnershipTransferred_Call struct {
+	*mock.Call
+}
+
+// WatchOwnershipTransferred is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterOwnershipTransferred
+//   - from []common.Address
+//   - to []common.Address
+func (_e *FeeQuoterInterface_Expecter) WatchOwnershipTransferred(opts interface{}, sink interface{}, from interface{}, to interface{}) *FeeQuoterInterface_WatchOwnershipTransferred_Call {
+	return &FeeQuoterInterface_WatchOwnershipTransferred_Call{Call: _e.mock.On("WatchOwnershipTransferred", opts, sink, from, to)}
+}
+
+func (_c *FeeQuoterInterface_WatchOwnershipTransferred_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterOwnershipTransferred, from []common.Address, to []common.Address)) *FeeQuoterInterface_WatchOwnershipTransferred_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterOwnershipTransferred), args[2].([]common.Address), args[3].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchOwnershipTransferred_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchOwnershipTransferred_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchOwnershipTransferred_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)) *FeeQuoterInterface_WatchOwnershipTransferred_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchPremiumMultiplierWeiPerEthUpdated provides a mock function with given fields: opts, sink, token
+func (_m *FeeQuoterInterface) WatchPremiumMultiplierWeiPerEthUpdated(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated, token []common.Address) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchPremiumMultiplierWeiPerEthUpdated")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated, []common.Address) (event.Subscription, error)); ok {
+		return rf(opts, sink, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated, []common.Address) event.Subscription); ok {
+		r0 = rf(opts, sink, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated, []common.Address) error); ok {
+		r1 = rf(opts, sink, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchPremiumMultiplierWeiPerEthUpdated'
+type FeeQuoterInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call struct {
+	*mock.Call
+}
+
+// WatchPremiumMultiplierWeiPerEthUpdated is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated
+//   - token []common.Address
+func (_e *FeeQuoterInterface_Expecter) WatchPremiumMultiplierWeiPerEthUpdated(opts interface{}, sink interface{}, token interface{}) *FeeQuoterInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call {
+	return &FeeQuoterInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call{Call: _e.mock.On("WatchPremiumMultiplierWeiPerEthUpdated", opts, sink, token)}
+}
+
+func (_c *FeeQuoterInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated, token []common.Address)) *FeeQuoterInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated), args[2].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthUpdated, []common.Address) (event.Subscription, error)) *FeeQuoterInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchPriceFeedPerTokenUpdated provides a mock function with given fields: opts, sink, token
+func (_m *FeeQuoterInterface) WatchPriceFeedPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated, token []common.Address) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchPriceFeedPerTokenUpdated")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated, []common.Address) (event.Subscription, error)); ok {
+		return rf(opts, sink, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated, []common.Address) event.Subscription); ok {
+		r0 = rf(opts, sink, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated, []common.Address) error); ok {
+		r1 = rf(opts, sink, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchPriceFeedPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchPriceFeedPerTokenUpdated'
+type FeeQuoterInterface_WatchPriceFeedPerTokenUpdated_Call struct {
+	*mock.Call
+}
+
+// WatchPriceFeedPerTokenUpdated is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated
+//   - token []common.Address
+func (_e *FeeQuoterInterface_Expecter) WatchPriceFeedPerTokenUpdated(opts interface{}, sink interface{}, token interface{}) *FeeQuoterInterface_WatchPriceFeedPerTokenUpdated_Call {
+	return &FeeQuoterInterface_WatchPriceFeedPerTokenUpdated_Call{Call: _e.mock.On("WatchPriceFeedPerTokenUpdated", opts, sink, token)}
+}
+
+func (_c *FeeQuoterInterface_WatchPriceFeedPerTokenUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated, token []common.Address)) *FeeQuoterInterface_WatchPriceFeedPerTokenUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated), args[2].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchPriceFeedPerTokenUpdated_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchPriceFeedPerTokenUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchPriceFeedPerTokenUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterPriceFeedPerTokenUpdated, []common.Address) (event.Subscription, error)) *FeeQuoterInterface_WatchPriceFeedPerTokenUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchReportPermissionSet provides a mock function with given fields: opts, sink, reportId
+func (_m *FeeQuoterInterface) WatchReportPermissionSet(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterReportPermissionSet, reportId [][32]byte) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, reportId)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchReportPermissionSet")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterReportPermissionSet, [][32]byte) (event.Subscription, error)); ok {
+		return rf(opts, sink, reportId)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterReportPermissionSet, [][32]byte) event.Subscription); ok {
+		r0 = rf(opts, sink, reportId)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterReportPermissionSet, [][32]byte) error); ok {
+		r1 = rf(opts, sink, reportId)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchReportPermissionSet_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchReportPermissionSet'
+type FeeQuoterInterface_WatchReportPermissionSet_Call struct {
+	*mock.Call
+}
+
+// WatchReportPermissionSet is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterReportPermissionSet
+//   - reportId [][32]byte
+func (_e *FeeQuoterInterface_Expecter) WatchReportPermissionSet(opts interface{}, sink interface{}, reportId interface{}) *FeeQuoterInterface_WatchReportPermissionSet_Call {
+	return &FeeQuoterInterface_WatchReportPermissionSet_Call{Call: _e.mock.On("WatchReportPermissionSet", opts, sink, reportId)}
+}
+
+func (_c *FeeQuoterInterface_WatchReportPermissionSet_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterReportPermissionSet, reportId [][32]byte)) *FeeQuoterInterface_WatchReportPermissionSet_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterReportPermissionSet), args[2].([][32]byte))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchReportPermissionSet_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchReportPermissionSet_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchReportPermissionSet_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterReportPermissionSet, [][32]byte) (event.Subscription, error)) *FeeQuoterInterface_WatchReportPermissionSet_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchTokenTransferFeeConfigDeleted provides a mock function with given fields: opts, sink, destChainSelector, token
+func (_m *FeeQuoterInterface) WatchTokenTransferFeeConfigDeleted(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted, destChainSelector []uint64, token []common.Address) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, destChainSelector, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchTokenTransferFeeConfigDeleted")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted, []uint64, []common.Address) (event.Subscription, error)); ok {
+		return rf(opts, sink, destChainSelector, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted, []uint64, []common.Address) event.Subscription); ok {
+		r0 = rf(opts, sink, destChainSelector, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted, []uint64, []common.Address) error); ok {
+		r1 = rf(opts, sink, destChainSelector, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchTokenTransferFeeConfigDeleted_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchTokenTransferFeeConfigDeleted'
+type FeeQuoterInterface_WatchTokenTransferFeeConfigDeleted_Call struct {
+	*mock.Call
+}
+
+// WatchTokenTransferFeeConfigDeleted is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted
+//   - destChainSelector []uint64
+//   - token []common.Address
+func (_e *FeeQuoterInterface_Expecter) WatchTokenTransferFeeConfigDeleted(opts interface{}, sink interface{}, destChainSelector interface{}, token interface{}) *FeeQuoterInterface_WatchTokenTransferFeeConfigDeleted_Call {
+	return &FeeQuoterInterface_WatchTokenTransferFeeConfigDeleted_Call{Call: _e.mock.On("WatchTokenTransferFeeConfigDeleted", opts, sink, destChainSelector, token)}
+}
+
+func (_c *FeeQuoterInterface_WatchTokenTransferFeeConfigDeleted_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted, destChainSelector []uint64, token []common.Address)) *FeeQuoterInterface_WatchTokenTransferFeeConfigDeleted_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted), args[2].([]uint64), args[3].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchTokenTransferFeeConfigDeleted_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchTokenTransferFeeConfigDeleted_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchTokenTransferFeeConfigDeleted_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigDeleted, []uint64, []common.Address) (event.Subscription, error)) *FeeQuoterInterface_WatchTokenTransferFeeConfigDeleted_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchTokenTransferFeeConfigUpdated provides a mock function with given fields: opts, sink, destChainSelector, token
+func (_m *FeeQuoterInterface) WatchTokenTransferFeeConfigUpdated(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated, destChainSelector []uint64, token []common.Address) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, destChainSelector, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchTokenTransferFeeConfigUpdated")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated, []uint64, []common.Address) (event.Subscription, error)); ok {
+		return rf(opts, sink, destChainSelector, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated, []uint64, []common.Address) event.Subscription); ok {
+		r0 = rf(opts, sink, destChainSelector, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated, []uint64, []common.Address) error); ok {
+		r1 = rf(opts, sink, destChainSelector, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchTokenTransferFeeConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchTokenTransferFeeConfigUpdated'
+type FeeQuoterInterface_WatchTokenTransferFeeConfigUpdated_Call struct {
+	*mock.Call
+}
+
+// WatchTokenTransferFeeConfigUpdated is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated
+//   - destChainSelector []uint64
+//   - token []common.Address
+func (_e *FeeQuoterInterface_Expecter) WatchTokenTransferFeeConfigUpdated(opts interface{}, sink interface{}, destChainSelector interface{}, token interface{}) *FeeQuoterInterface_WatchTokenTransferFeeConfigUpdated_Call {
+	return &FeeQuoterInterface_WatchTokenTransferFeeConfigUpdated_Call{Call: _e.mock.On("WatchTokenTransferFeeConfigUpdated", opts, sink, destChainSelector, token)}
+}
+
+func (_c *FeeQuoterInterface_WatchTokenTransferFeeConfigUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated, destChainSelector []uint64, token []common.Address)) *FeeQuoterInterface_WatchTokenTransferFeeConfigUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated), args[2].([]uint64), args[3].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchTokenTransferFeeConfigUpdated_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchTokenTransferFeeConfigUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchTokenTransferFeeConfigUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterTokenTransferFeeConfigUpdated, []uint64, []common.Address) (event.Subscription, error)) *FeeQuoterInterface_WatchTokenTransferFeeConfigUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchUsdPerTokenUpdated provides a mock function with given fields: opts, sink, token
+func (_m *FeeQuoterInterface) WatchUsdPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterUsdPerTokenUpdated, token []common.Address) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, token)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchUsdPerTokenUpdated")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterUsdPerTokenUpdated, []common.Address) (event.Subscription, error)); ok {
+		return rf(opts, sink, token)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterUsdPerTokenUpdated, []common.Address) event.Subscription); ok {
+		r0 = rf(opts, sink, token)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterUsdPerTokenUpdated, []common.Address) error); ok {
+		r1 = rf(opts, sink, token)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchUsdPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchUsdPerTokenUpdated'
+type FeeQuoterInterface_WatchUsdPerTokenUpdated_Call struct {
+	*mock.Call
+}
+
+// WatchUsdPerTokenUpdated is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterUsdPerTokenUpdated
+//   - token []common.Address
+func (_e *FeeQuoterInterface_Expecter) WatchUsdPerTokenUpdated(opts interface{}, sink interface{}, token interface{}) *FeeQuoterInterface_WatchUsdPerTokenUpdated_Call {
+	return &FeeQuoterInterface_WatchUsdPerTokenUpdated_Call{Call: _e.mock.On("WatchUsdPerTokenUpdated", opts, sink, token)}
+}
+
+func (_c *FeeQuoterInterface_WatchUsdPerTokenUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterUsdPerTokenUpdated, token []common.Address)) *FeeQuoterInterface_WatchUsdPerTokenUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterUsdPerTokenUpdated), args[2].([]common.Address))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchUsdPerTokenUpdated_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchUsdPerTokenUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchUsdPerTokenUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterUsdPerTokenUpdated, []common.Address) (event.Subscription, error)) *FeeQuoterInterface_WatchUsdPerTokenUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// WatchUsdPerUnitGasUpdated provides a mock function with given fields: opts, sink, destChain
+func (_m *FeeQuoterInterface) WatchUsdPerUnitGasUpdated(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterUsdPerUnitGasUpdated, destChain []uint64) (event.Subscription, error) {
+	ret := _m.Called(opts, sink, destChain)
+
+	if len(ret) == 0 {
+		panic("no return value specified for WatchUsdPerUnitGasUpdated")
+	}
+
+	var r0 event.Subscription
+	var r1 error
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterUsdPerUnitGasUpdated, []uint64) (event.Subscription, error)); ok {
+		return rf(opts, sink, destChain)
+	}
+	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterUsdPerUnitGasUpdated, []uint64) event.Subscription); ok {
+		r0 = rf(opts, sink, destChain)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(event.Subscription)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterUsdPerUnitGasUpdated, []uint64) error); ok {
+		r1 = rf(opts, sink, destChain)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FeeQuoterInterface_WatchUsdPerUnitGasUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchUsdPerUnitGasUpdated'
+type FeeQuoterInterface_WatchUsdPerUnitGasUpdated_Call struct {
+	*mock.Call
+}
+
+// WatchUsdPerUnitGasUpdated is a helper method to define mock.On call
+//   - opts *bind.WatchOpts
+//   - sink chan<- *fee_quoter.FeeQuoterUsdPerUnitGasUpdated
+//   - destChain []uint64
+func (_e *FeeQuoterInterface_Expecter) WatchUsdPerUnitGasUpdated(opts interface{}, sink interface{}, destChain interface{}) *FeeQuoterInterface_WatchUsdPerUnitGasUpdated_Call {
+	return &FeeQuoterInterface_WatchUsdPerUnitGasUpdated_Call{Call: _e.mock.On("WatchUsdPerUnitGasUpdated", opts, sink, destChain)}
+}
+
+func (_c *FeeQuoterInterface_WatchUsdPerUnitGasUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *fee_quoter.FeeQuoterUsdPerUnitGasUpdated, destChain []uint64)) *FeeQuoterInterface_WatchUsdPerUnitGasUpdated_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*bind.WatchOpts), args[1].(chan<- *fee_quoter.FeeQuoterUsdPerUnitGasUpdated), args[2].([]uint64))
+	})
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchUsdPerUnitGasUpdated_Call) Return(_a0 event.Subscription, _a1 error) *FeeQuoterInterface_WatchUsdPerUnitGasUpdated_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *FeeQuoterInterface_WatchUsdPerUnitGasUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *fee_quoter.FeeQuoterUsdPerUnitGasUpdated, []uint64) (event.Subscription, error)) *FeeQuoterInterface_WatchUsdPerUnitGasUpdated_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// NewFeeQuoterInterface creates a new instance of FeeQuoterInterface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewFeeQuoterInterface(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *FeeQuoterInterface {
+	mock := &FeeQuoterInterface{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/core/gethwrappers/ccip/mocks/price_registry_interface.go b/core/gethwrappers/ccip/mocks/price_registry_interface.go
deleted file mode 100644
index 01d435d05a..0000000000
--- a/core/gethwrappers/ccip/mocks/price_registry_interface.go
+++ /dev/null
@@ -1,4497 +0,0 @@
-// Code generated by mockery v2.43.2. DO NOT EDIT.
-
-package mock_contracts
-
-import (
-	big "math/big"
-
-	bind "github.com/ethereum/go-ethereum/accounts/abi/bind"
-	common "github.com/ethereum/go-ethereum/common"
-
-	event "github.com/ethereum/go-ethereum/event"
-
-	generated "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
-
-	mock "github.com/stretchr/testify/mock"
-
-	price_registry "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry"
-
-	types "github.com/ethereum/go-ethereum/core/types"
-)
-
-// PriceRegistryInterface is an autogenerated mock type for the PriceRegistryInterface type
-type PriceRegistryInterface struct {
-	mock.Mock
-}
-
-type PriceRegistryInterface_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *PriceRegistryInterface) EXPECT() *PriceRegistryInterface_Expecter {
-	return &PriceRegistryInterface_Expecter{mock: &_m.Mock}
-}
-
-// AcceptOwnership provides a mock function with given fields: opts
-func (_m *PriceRegistryInterface) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
-	ret := _m.Called(opts)
-
-	if len(ret) == 0 {
-		panic("no return value specified for AcceptOwnership")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
-		return rf(opts)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) *types.Transaction); ok {
-		r0 = rf(opts)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts) error); ok {
-		r1 = rf(opts)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_AcceptOwnership_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'AcceptOwnership'
-type PriceRegistryInterface_AcceptOwnership_Call struct {
-	*mock.Call
-}
-
-// AcceptOwnership is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-func (_e *PriceRegistryInterface_Expecter) AcceptOwnership(opts interface{}) *PriceRegistryInterface_AcceptOwnership_Call {
-	return &PriceRegistryInterface_AcceptOwnership_Call{Call: _e.mock.On("AcceptOwnership", opts)}
-}
-
-func (_c *PriceRegistryInterface_AcceptOwnership_Call) Run(run func(opts *bind.TransactOpts)) *PriceRegistryInterface_AcceptOwnership_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_AcceptOwnership_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_AcceptOwnership_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_AcceptOwnership_Call) RunAndReturn(run func(*bind.TransactOpts) (*types.Transaction, error)) *PriceRegistryInterface_AcceptOwnership_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Address provides a mock function with given fields:
-func (_m *PriceRegistryInterface) Address() common.Address {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for Address")
-	}
-
-	var r0 common.Address
-	if rf, ok := ret.Get(0).(func() common.Address); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(common.Address)
-		}
-	}
-
-	return r0
-}
-
-// PriceRegistryInterface_Address_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Address'
-type PriceRegistryInterface_Address_Call struct {
-	*mock.Call
-}
-
-// Address is a helper method to define mock.On call
-func (_e *PriceRegistryInterface_Expecter) Address() *PriceRegistryInterface_Address_Call {
-	return &PriceRegistryInterface_Address_Call{Call: _e.mock.On("Address")}
-}
-
-func (_c *PriceRegistryInterface_Address_Call) Run(run func()) *PriceRegistryInterface_Address_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_Address_Call) Return(_a0 common.Address) *PriceRegistryInterface_Address_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_Address_Call) RunAndReturn(run func() common.Address) *PriceRegistryInterface_Address_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ApplyAuthorizedCallerUpdates provides a mock function with given fields: opts, authorizedCallerArgs
-func (_m *PriceRegistryInterface) ApplyAuthorizedCallerUpdates(opts *bind.TransactOpts, authorizedCallerArgs price_registry.AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error) {
-	ret := _m.Called(opts, authorizedCallerArgs)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ApplyAuthorizedCallerUpdates")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, price_registry.AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error)); ok {
-		return rf(opts, authorizedCallerArgs)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, price_registry.AuthorizedCallersAuthorizedCallerArgs) *types.Transaction); ok {
-		r0 = rf(opts, authorizedCallerArgs)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, price_registry.AuthorizedCallersAuthorizedCallerArgs) error); ok {
-		r1 = rf(opts, authorizedCallerArgs)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ApplyAuthorizedCallerUpdates_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyAuthorizedCallerUpdates'
-type PriceRegistryInterface_ApplyAuthorizedCallerUpdates_Call struct {
-	*mock.Call
-}
-
-// ApplyAuthorizedCallerUpdates is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-//   - authorizedCallerArgs price_registry.AuthorizedCallersAuthorizedCallerArgs
-func (_e *PriceRegistryInterface_Expecter) ApplyAuthorizedCallerUpdates(opts interface{}, authorizedCallerArgs interface{}) *PriceRegistryInterface_ApplyAuthorizedCallerUpdates_Call {
-	return &PriceRegistryInterface_ApplyAuthorizedCallerUpdates_Call{Call: _e.mock.On("ApplyAuthorizedCallerUpdates", opts, authorizedCallerArgs)}
-}
-
-func (_c *PriceRegistryInterface_ApplyAuthorizedCallerUpdates_Call) Run(run func(opts *bind.TransactOpts, authorizedCallerArgs price_registry.AuthorizedCallersAuthorizedCallerArgs)) *PriceRegistryInterface_ApplyAuthorizedCallerUpdates_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts), args[1].(price_registry.AuthorizedCallersAuthorizedCallerArgs))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ApplyAuthorizedCallerUpdates_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_ApplyAuthorizedCallerUpdates_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ApplyAuthorizedCallerUpdates_Call) RunAndReturn(run func(*bind.TransactOpts, price_registry.AuthorizedCallersAuthorizedCallerArgs) (*types.Transaction, error)) *PriceRegistryInterface_ApplyAuthorizedCallerUpdates_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ApplyDestChainConfigUpdates provides a mock function with given fields: opts, destChainConfigArgs
-func (_m *PriceRegistryInterface) ApplyDestChainConfigUpdates(opts *bind.TransactOpts, destChainConfigArgs []price_registry.PriceRegistryDestChainConfigArgs) (*types.Transaction, error) {
-	ret := _m.Called(opts, destChainConfigArgs)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ApplyDestChainConfigUpdates")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []price_registry.PriceRegistryDestChainConfigArgs) (*types.Transaction, error)); ok {
-		return rf(opts, destChainConfigArgs)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []price_registry.PriceRegistryDestChainConfigArgs) *types.Transaction); ok {
-		r0 = rf(opts, destChainConfigArgs)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []price_registry.PriceRegistryDestChainConfigArgs) error); ok {
-		r1 = rf(opts, destChainConfigArgs)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ApplyDestChainConfigUpdates_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyDestChainConfigUpdates'
-type PriceRegistryInterface_ApplyDestChainConfigUpdates_Call struct {
-	*mock.Call
-}
-
-// ApplyDestChainConfigUpdates is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-//   - destChainConfigArgs []price_registry.PriceRegistryDestChainConfigArgs
-func (_e *PriceRegistryInterface_Expecter) ApplyDestChainConfigUpdates(opts interface{}, destChainConfigArgs interface{}) *PriceRegistryInterface_ApplyDestChainConfigUpdates_Call {
-	return &PriceRegistryInterface_ApplyDestChainConfigUpdates_Call{Call: _e.mock.On("ApplyDestChainConfigUpdates", opts, destChainConfigArgs)}
-}
-
-func (_c *PriceRegistryInterface_ApplyDestChainConfigUpdates_Call) Run(run func(opts *bind.TransactOpts, destChainConfigArgs []price_registry.PriceRegistryDestChainConfigArgs)) *PriceRegistryInterface_ApplyDestChainConfigUpdates_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts), args[1].([]price_registry.PriceRegistryDestChainConfigArgs))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ApplyDestChainConfigUpdates_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_ApplyDestChainConfigUpdates_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ApplyDestChainConfigUpdates_Call) RunAndReturn(run func(*bind.TransactOpts, []price_registry.PriceRegistryDestChainConfigArgs) (*types.Transaction, error)) *PriceRegistryInterface_ApplyDestChainConfigUpdates_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ApplyFeeTokensUpdates provides a mock function with given fields: opts, feeTokensToAdd, feeTokensToRemove
-func (_m *PriceRegistryInterface) ApplyFeeTokensUpdates(opts *bind.TransactOpts, feeTokensToAdd []common.Address, feeTokensToRemove []common.Address) (*types.Transaction, error) {
-	ret := _m.Called(opts, feeTokensToAdd, feeTokensToRemove)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ApplyFeeTokensUpdates")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []common.Address) (*types.Transaction, error)); ok {
-		return rf(opts, feeTokensToAdd, feeTokensToRemove)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []common.Address) *types.Transaction); ok {
-		r0 = rf(opts, feeTokensToAdd, feeTokensToRemove)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []common.Address, []common.Address) error); ok {
-		r1 = rf(opts, feeTokensToAdd, feeTokensToRemove)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ApplyFeeTokensUpdates_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyFeeTokensUpdates'
-type PriceRegistryInterface_ApplyFeeTokensUpdates_Call struct {
-	*mock.Call
-}
-
-// ApplyFeeTokensUpdates is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-//   - feeTokensToAdd []common.Address
-//   - feeTokensToRemove []common.Address
-func (_e *PriceRegistryInterface_Expecter) ApplyFeeTokensUpdates(opts interface{}, feeTokensToAdd interface{}, feeTokensToRemove interface{}) *PriceRegistryInterface_ApplyFeeTokensUpdates_Call {
-	return &PriceRegistryInterface_ApplyFeeTokensUpdates_Call{Call: _e.mock.On("ApplyFeeTokensUpdates", opts, feeTokensToAdd, feeTokensToRemove)}
-}
-
-func (_c *PriceRegistryInterface_ApplyFeeTokensUpdates_Call) Run(run func(opts *bind.TransactOpts, feeTokensToAdd []common.Address, feeTokensToRemove []common.Address)) *PriceRegistryInterface_ApplyFeeTokensUpdates_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts), args[1].([]common.Address), args[2].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ApplyFeeTokensUpdates_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_ApplyFeeTokensUpdates_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ApplyFeeTokensUpdates_Call) RunAndReturn(run func(*bind.TransactOpts, []common.Address, []common.Address) (*types.Transaction, error)) *PriceRegistryInterface_ApplyFeeTokensUpdates_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ApplyPremiumMultiplierWeiPerEthUpdates provides a mock function with given fields: opts, premiumMultiplierWeiPerEthArgs
-func (_m *PriceRegistryInterface) ApplyPremiumMultiplierWeiPerEthUpdates(opts *bind.TransactOpts, premiumMultiplierWeiPerEthArgs []price_registry.PriceRegistryPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error) {
-	ret := _m.Called(opts, premiumMultiplierWeiPerEthArgs)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ApplyPremiumMultiplierWeiPerEthUpdates")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []price_registry.PriceRegistryPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error)); ok {
-		return rf(opts, premiumMultiplierWeiPerEthArgs)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []price_registry.PriceRegistryPremiumMultiplierWeiPerEthArgs) *types.Transaction); ok {
-		r0 = rf(opts, premiumMultiplierWeiPerEthArgs)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []price_registry.PriceRegistryPremiumMultiplierWeiPerEthArgs) error); ok {
-		r1 = rf(opts, premiumMultiplierWeiPerEthArgs)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyPremiumMultiplierWeiPerEthUpdates'
-type PriceRegistryInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call struct {
-	*mock.Call
-}
-
-// ApplyPremiumMultiplierWeiPerEthUpdates is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-//   - premiumMultiplierWeiPerEthArgs []price_registry.PriceRegistryPremiumMultiplierWeiPerEthArgs
-func (_e *PriceRegistryInterface_Expecter) ApplyPremiumMultiplierWeiPerEthUpdates(opts interface{}, premiumMultiplierWeiPerEthArgs interface{}) *PriceRegistryInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call {
-	return &PriceRegistryInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call{Call: _e.mock.On("ApplyPremiumMultiplierWeiPerEthUpdates", opts, premiumMultiplierWeiPerEthArgs)}
-}
-
-func (_c *PriceRegistryInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call) Run(run func(opts *bind.TransactOpts, premiumMultiplierWeiPerEthArgs []price_registry.PriceRegistryPremiumMultiplierWeiPerEthArgs)) *PriceRegistryInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts), args[1].([]price_registry.PriceRegistryPremiumMultiplierWeiPerEthArgs))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call) RunAndReturn(run func(*bind.TransactOpts, []price_registry.PriceRegistryPremiumMultiplierWeiPerEthArgs) (*types.Transaction, error)) *PriceRegistryInterface_ApplyPremiumMultiplierWeiPerEthUpdates_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ApplyTokenTransferFeeConfigUpdates provides a mock function with given fields: opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs
-func (_m *PriceRegistryInterface) ApplyTokenTransferFeeConfigUpdates(opts *bind.TransactOpts, tokenTransferFeeConfigArgs []price_registry.PriceRegistryTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []price_registry.PriceRegistryTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error) {
-	ret := _m.Called(opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ApplyTokenTransferFeeConfigUpdates")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []price_registry.PriceRegistryTokenTransferFeeConfigArgs, []price_registry.PriceRegistryTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error)); ok {
-		return rf(opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []price_registry.PriceRegistryTokenTransferFeeConfigArgs, []price_registry.PriceRegistryTokenTransferFeeConfigRemoveArgs) *types.Transaction); ok {
-		r0 = rf(opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []price_registry.PriceRegistryTokenTransferFeeConfigArgs, []price_registry.PriceRegistryTokenTransferFeeConfigRemoveArgs) error); ok {
-		r1 = rf(opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ApplyTokenTransferFeeConfigUpdates_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ApplyTokenTransferFeeConfigUpdates'
-type PriceRegistryInterface_ApplyTokenTransferFeeConfigUpdates_Call struct {
-	*mock.Call
-}
-
-// ApplyTokenTransferFeeConfigUpdates is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-//   - tokenTransferFeeConfigArgs []price_registry.PriceRegistryTokenTransferFeeConfigArgs
-//   - tokensToUseDefaultFeeConfigs []price_registry.PriceRegistryTokenTransferFeeConfigRemoveArgs
-func (_e *PriceRegistryInterface_Expecter) ApplyTokenTransferFeeConfigUpdates(opts interface{}, tokenTransferFeeConfigArgs interface{}, tokensToUseDefaultFeeConfigs interface{}) *PriceRegistryInterface_ApplyTokenTransferFeeConfigUpdates_Call {
-	return &PriceRegistryInterface_ApplyTokenTransferFeeConfigUpdates_Call{Call: _e.mock.On("ApplyTokenTransferFeeConfigUpdates", opts, tokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs)}
-}
-
-func (_c *PriceRegistryInterface_ApplyTokenTransferFeeConfigUpdates_Call) Run(run func(opts *bind.TransactOpts, tokenTransferFeeConfigArgs []price_registry.PriceRegistryTokenTransferFeeConfigArgs, tokensToUseDefaultFeeConfigs []price_registry.PriceRegistryTokenTransferFeeConfigRemoveArgs)) *PriceRegistryInterface_ApplyTokenTransferFeeConfigUpdates_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts), args[1].([]price_registry.PriceRegistryTokenTransferFeeConfigArgs), args[2].([]price_registry.PriceRegistryTokenTransferFeeConfigRemoveArgs))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ApplyTokenTransferFeeConfigUpdates_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_ApplyTokenTransferFeeConfigUpdates_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ApplyTokenTransferFeeConfigUpdates_Call) RunAndReturn(run func(*bind.TransactOpts, []price_registry.PriceRegistryTokenTransferFeeConfigArgs, []price_registry.PriceRegistryTokenTransferFeeConfigRemoveArgs) (*types.Transaction, error)) *PriceRegistryInterface_ApplyTokenTransferFeeConfigUpdates_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ConvertTokenAmount provides a mock function with given fields: opts, fromToken, fromTokenAmount, toToken
-func (_m *PriceRegistryInterface) ConvertTokenAmount(opts *bind.CallOpts, fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address) (*big.Int, error) {
-	ret := _m.Called(opts, fromToken, fromTokenAmount, toToken)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ConvertTokenAmount")
-	}
-
-	var r0 *big.Int
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, *big.Int, common.Address) (*big.Int, error)); ok {
-		return rf(opts, fromToken, fromTokenAmount, toToken)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, *big.Int, common.Address) *big.Int); ok {
-		r0 = rf(opts, fromToken, fromTokenAmount, toToken)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*big.Int)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address, *big.Int, common.Address) error); ok {
-		r1 = rf(opts, fromToken, fromTokenAmount, toToken)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ConvertTokenAmount_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ConvertTokenAmount'
-type PriceRegistryInterface_ConvertTokenAmount_Call struct {
-	*mock.Call
-}
-
-// ConvertTokenAmount is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - fromToken common.Address
-//   - fromTokenAmount *big.Int
-//   - toToken common.Address
-func (_e *PriceRegistryInterface_Expecter) ConvertTokenAmount(opts interface{}, fromToken interface{}, fromTokenAmount interface{}, toToken interface{}) *PriceRegistryInterface_ConvertTokenAmount_Call {
-	return &PriceRegistryInterface_ConvertTokenAmount_Call{Call: _e.mock.On("ConvertTokenAmount", opts, fromToken, fromTokenAmount, toToken)}
-}
-
-func (_c *PriceRegistryInterface_ConvertTokenAmount_Call) Run(run func(opts *bind.CallOpts, fromToken common.Address, fromTokenAmount *big.Int, toToken common.Address)) *PriceRegistryInterface_ConvertTokenAmount_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(common.Address), args[2].(*big.Int), args[3].(common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ConvertTokenAmount_Call) Return(_a0 *big.Int, _a1 error) *PriceRegistryInterface_ConvertTokenAmount_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ConvertTokenAmount_Call) RunAndReturn(run func(*bind.CallOpts, common.Address, *big.Int, common.Address) (*big.Int, error)) *PriceRegistryInterface_ConvertTokenAmount_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterAuthorizedCallerAdded provides a mock function with given fields: opts
-func (_m *PriceRegistryInterface) FilterAuthorizedCallerAdded(opts *bind.FilterOpts) (*price_registry.PriceRegistryAuthorizedCallerAddedIterator, error) {
-	ret := _m.Called(opts)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterAuthorizedCallerAdded")
-	}
-
-	var r0 *price_registry.PriceRegistryAuthorizedCallerAddedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*price_registry.PriceRegistryAuthorizedCallerAddedIterator, error)); ok {
-		return rf(opts)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) *price_registry.PriceRegistryAuthorizedCallerAddedIterator); ok {
-		r0 = rf(opts)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryAuthorizedCallerAddedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts) error); ok {
-		r1 = rf(opts)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterAuthorizedCallerAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterAuthorizedCallerAdded'
-type PriceRegistryInterface_FilterAuthorizedCallerAdded_Call struct {
-	*mock.Call
-}
-
-// FilterAuthorizedCallerAdded is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-func (_e *PriceRegistryInterface_Expecter) FilterAuthorizedCallerAdded(opts interface{}) *PriceRegistryInterface_FilterAuthorizedCallerAdded_Call {
-	return &PriceRegistryInterface_FilterAuthorizedCallerAdded_Call{Call: _e.mock.On("FilterAuthorizedCallerAdded", opts)}
-}
-
-func (_c *PriceRegistryInterface_FilterAuthorizedCallerAdded_Call) Run(run func(opts *bind.FilterOpts)) *PriceRegistryInterface_FilterAuthorizedCallerAdded_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterAuthorizedCallerAdded_Call) Return(_a0 *price_registry.PriceRegistryAuthorizedCallerAddedIterator, _a1 error) *PriceRegistryInterface_FilterAuthorizedCallerAdded_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterAuthorizedCallerAdded_Call) RunAndReturn(run func(*bind.FilterOpts) (*price_registry.PriceRegistryAuthorizedCallerAddedIterator, error)) *PriceRegistryInterface_FilterAuthorizedCallerAdded_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterAuthorizedCallerRemoved provides a mock function with given fields: opts
-func (_m *PriceRegistryInterface) FilterAuthorizedCallerRemoved(opts *bind.FilterOpts) (*price_registry.PriceRegistryAuthorizedCallerRemovedIterator, error) {
-	ret := _m.Called(opts)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterAuthorizedCallerRemoved")
-	}
-
-	var r0 *price_registry.PriceRegistryAuthorizedCallerRemovedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*price_registry.PriceRegistryAuthorizedCallerRemovedIterator, error)); ok {
-		return rf(opts)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) *price_registry.PriceRegistryAuthorizedCallerRemovedIterator); ok {
-		r0 = rf(opts)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryAuthorizedCallerRemovedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts) error); ok {
-		r1 = rf(opts)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterAuthorizedCallerRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterAuthorizedCallerRemoved'
-type PriceRegistryInterface_FilterAuthorizedCallerRemoved_Call struct {
-	*mock.Call
-}
-
-// FilterAuthorizedCallerRemoved is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-func (_e *PriceRegistryInterface_Expecter) FilterAuthorizedCallerRemoved(opts interface{}) *PriceRegistryInterface_FilterAuthorizedCallerRemoved_Call {
-	return &PriceRegistryInterface_FilterAuthorizedCallerRemoved_Call{Call: _e.mock.On("FilterAuthorizedCallerRemoved", opts)}
-}
-
-func (_c *PriceRegistryInterface_FilterAuthorizedCallerRemoved_Call) Run(run func(opts *bind.FilterOpts)) *PriceRegistryInterface_FilterAuthorizedCallerRemoved_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterAuthorizedCallerRemoved_Call) Return(_a0 *price_registry.PriceRegistryAuthorizedCallerRemovedIterator, _a1 error) *PriceRegistryInterface_FilterAuthorizedCallerRemoved_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterAuthorizedCallerRemoved_Call) RunAndReturn(run func(*bind.FilterOpts) (*price_registry.PriceRegistryAuthorizedCallerRemovedIterator, error)) *PriceRegistryInterface_FilterAuthorizedCallerRemoved_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterDestChainAdded provides a mock function with given fields: opts, destChainSelector
-func (_m *PriceRegistryInterface) FilterDestChainAdded(opts *bind.FilterOpts, destChainSelector []uint64) (*price_registry.PriceRegistryDestChainAddedIterator, error) {
-	ret := _m.Called(opts, destChainSelector)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterDestChainAdded")
-	}
-
-	var r0 *price_registry.PriceRegistryDestChainAddedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*price_registry.PriceRegistryDestChainAddedIterator, error)); ok {
-		return rf(opts, destChainSelector)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) *price_registry.PriceRegistryDestChainAddedIterator); ok {
-		r0 = rf(opts, destChainSelector)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryDestChainAddedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []uint64) error); ok {
-		r1 = rf(opts, destChainSelector)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterDestChainAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterDestChainAdded'
-type PriceRegistryInterface_FilterDestChainAdded_Call struct {
-	*mock.Call
-}
-
-// FilterDestChainAdded is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - destChainSelector []uint64
-func (_e *PriceRegistryInterface_Expecter) FilterDestChainAdded(opts interface{}, destChainSelector interface{}) *PriceRegistryInterface_FilterDestChainAdded_Call {
-	return &PriceRegistryInterface_FilterDestChainAdded_Call{Call: _e.mock.On("FilterDestChainAdded", opts, destChainSelector)}
-}
-
-func (_c *PriceRegistryInterface_FilterDestChainAdded_Call) Run(run func(opts *bind.FilterOpts, destChainSelector []uint64)) *PriceRegistryInterface_FilterDestChainAdded_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]uint64))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterDestChainAdded_Call) Return(_a0 *price_registry.PriceRegistryDestChainAddedIterator, _a1 error) *PriceRegistryInterface_FilterDestChainAdded_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterDestChainAdded_Call) RunAndReturn(run func(*bind.FilterOpts, []uint64) (*price_registry.PriceRegistryDestChainAddedIterator, error)) *PriceRegistryInterface_FilterDestChainAdded_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterDestChainConfigUpdated provides a mock function with given fields: opts, destChainSelector
-func (_m *PriceRegistryInterface) FilterDestChainConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64) (*price_registry.PriceRegistryDestChainConfigUpdatedIterator, error) {
-	ret := _m.Called(opts, destChainSelector)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterDestChainConfigUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryDestChainConfigUpdatedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*price_registry.PriceRegistryDestChainConfigUpdatedIterator, error)); ok {
-		return rf(opts, destChainSelector)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) *price_registry.PriceRegistryDestChainConfigUpdatedIterator); ok {
-		r0 = rf(opts, destChainSelector)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryDestChainConfigUpdatedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []uint64) error); ok {
-		r1 = rf(opts, destChainSelector)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterDestChainConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterDestChainConfigUpdated'
-type PriceRegistryInterface_FilterDestChainConfigUpdated_Call struct {
-	*mock.Call
-}
-
-// FilterDestChainConfigUpdated is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - destChainSelector []uint64
-func (_e *PriceRegistryInterface_Expecter) FilterDestChainConfigUpdated(opts interface{}, destChainSelector interface{}) *PriceRegistryInterface_FilterDestChainConfigUpdated_Call {
-	return &PriceRegistryInterface_FilterDestChainConfigUpdated_Call{Call: _e.mock.On("FilterDestChainConfigUpdated", opts, destChainSelector)}
-}
-
-func (_c *PriceRegistryInterface_FilterDestChainConfigUpdated_Call) Run(run func(opts *bind.FilterOpts, destChainSelector []uint64)) *PriceRegistryInterface_FilterDestChainConfigUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]uint64))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterDestChainConfigUpdated_Call) Return(_a0 *price_registry.PriceRegistryDestChainConfigUpdatedIterator, _a1 error) *PriceRegistryInterface_FilterDestChainConfigUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterDestChainConfigUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []uint64) (*price_registry.PriceRegistryDestChainConfigUpdatedIterator, error)) *PriceRegistryInterface_FilterDestChainConfigUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterFeeTokenAdded provides a mock function with given fields: opts, feeToken
-func (_m *PriceRegistryInterface) FilterFeeTokenAdded(opts *bind.FilterOpts, feeToken []common.Address) (*price_registry.PriceRegistryFeeTokenAddedIterator, error) {
-	ret := _m.Called(opts, feeToken)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterFeeTokenAdded")
-	}
-
-	var r0 *price_registry.PriceRegistryFeeTokenAddedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*price_registry.PriceRegistryFeeTokenAddedIterator, error)); ok {
-		return rf(opts, feeToken)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) *price_registry.PriceRegistryFeeTokenAddedIterator); ok {
-		r0 = rf(opts, feeToken)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryFeeTokenAddedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address) error); ok {
-		r1 = rf(opts, feeToken)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterFeeTokenAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterFeeTokenAdded'
-type PriceRegistryInterface_FilterFeeTokenAdded_Call struct {
-	*mock.Call
-}
-
-// FilterFeeTokenAdded is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - feeToken []common.Address
-func (_e *PriceRegistryInterface_Expecter) FilterFeeTokenAdded(opts interface{}, feeToken interface{}) *PriceRegistryInterface_FilterFeeTokenAdded_Call {
-	return &PriceRegistryInterface_FilterFeeTokenAdded_Call{Call: _e.mock.On("FilterFeeTokenAdded", opts, feeToken)}
-}
-
-func (_c *PriceRegistryInterface_FilterFeeTokenAdded_Call) Run(run func(opts *bind.FilterOpts, feeToken []common.Address)) *PriceRegistryInterface_FilterFeeTokenAdded_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterFeeTokenAdded_Call) Return(_a0 *price_registry.PriceRegistryFeeTokenAddedIterator, _a1 error) *PriceRegistryInterface_FilterFeeTokenAdded_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterFeeTokenAdded_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address) (*price_registry.PriceRegistryFeeTokenAddedIterator, error)) *PriceRegistryInterface_FilterFeeTokenAdded_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterFeeTokenRemoved provides a mock function with given fields: opts, feeToken
-func (_m *PriceRegistryInterface) FilterFeeTokenRemoved(opts *bind.FilterOpts, feeToken []common.Address) (*price_registry.PriceRegistryFeeTokenRemovedIterator, error) {
-	ret := _m.Called(opts, feeToken)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterFeeTokenRemoved")
-	}
-
-	var r0 *price_registry.PriceRegistryFeeTokenRemovedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*price_registry.PriceRegistryFeeTokenRemovedIterator, error)); ok {
-		return rf(opts, feeToken)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) *price_registry.PriceRegistryFeeTokenRemovedIterator); ok {
-		r0 = rf(opts, feeToken)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryFeeTokenRemovedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address) error); ok {
-		r1 = rf(opts, feeToken)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterFeeTokenRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterFeeTokenRemoved'
-type PriceRegistryInterface_FilterFeeTokenRemoved_Call struct {
-	*mock.Call
-}
-
-// FilterFeeTokenRemoved is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - feeToken []common.Address
-func (_e *PriceRegistryInterface_Expecter) FilterFeeTokenRemoved(opts interface{}, feeToken interface{}) *PriceRegistryInterface_FilterFeeTokenRemoved_Call {
-	return &PriceRegistryInterface_FilterFeeTokenRemoved_Call{Call: _e.mock.On("FilterFeeTokenRemoved", opts, feeToken)}
-}
-
-func (_c *PriceRegistryInterface_FilterFeeTokenRemoved_Call) Run(run func(opts *bind.FilterOpts, feeToken []common.Address)) *PriceRegistryInterface_FilterFeeTokenRemoved_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterFeeTokenRemoved_Call) Return(_a0 *price_registry.PriceRegistryFeeTokenRemovedIterator, _a1 error) *PriceRegistryInterface_FilterFeeTokenRemoved_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterFeeTokenRemoved_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address) (*price_registry.PriceRegistryFeeTokenRemovedIterator, error)) *PriceRegistryInterface_FilterFeeTokenRemoved_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterOwnershipTransferRequested provides a mock function with given fields: opts, from, to
-func (_m *PriceRegistryInterface) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*price_registry.PriceRegistryOwnershipTransferRequestedIterator, error) {
-	ret := _m.Called(opts, from, to)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterOwnershipTransferRequested")
-	}
-
-	var r0 *price_registry.PriceRegistryOwnershipTransferRequestedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*price_registry.PriceRegistryOwnershipTransferRequestedIterator, error)); ok {
-		return rf(opts, from, to)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) *price_registry.PriceRegistryOwnershipTransferRequestedIterator); ok {
-		r0 = rf(opts, from, to)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryOwnershipTransferRequestedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address, []common.Address) error); ok {
-		r1 = rf(opts, from, to)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterOwnershipTransferRequested_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterOwnershipTransferRequested'
-type PriceRegistryInterface_FilterOwnershipTransferRequested_Call struct {
-	*mock.Call
-}
-
-// FilterOwnershipTransferRequested is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - from []common.Address
-//   - to []common.Address
-func (_e *PriceRegistryInterface_Expecter) FilterOwnershipTransferRequested(opts interface{}, from interface{}, to interface{}) *PriceRegistryInterface_FilterOwnershipTransferRequested_Call {
-	return &PriceRegistryInterface_FilterOwnershipTransferRequested_Call{Call: _e.mock.On("FilterOwnershipTransferRequested", opts, from, to)}
-}
-
-func (_c *PriceRegistryInterface_FilterOwnershipTransferRequested_Call) Run(run func(opts *bind.FilterOpts, from []common.Address, to []common.Address)) *PriceRegistryInterface_FilterOwnershipTransferRequested_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]common.Address), args[2].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterOwnershipTransferRequested_Call) Return(_a0 *price_registry.PriceRegistryOwnershipTransferRequestedIterator, _a1 error) *PriceRegistryInterface_FilterOwnershipTransferRequested_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterOwnershipTransferRequested_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address, []common.Address) (*price_registry.PriceRegistryOwnershipTransferRequestedIterator, error)) *PriceRegistryInterface_FilterOwnershipTransferRequested_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterOwnershipTransferred provides a mock function with given fields: opts, from, to
-func (_m *PriceRegistryInterface) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*price_registry.PriceRegistryOwnershipTransferredIterator, error) {
-	ret := _m.Called(opts, from, to)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterOwnershipTransferred")
-	}
-
-	var r0 *price_registry.PriceRegistryOwnershipTransferredIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*price_registry.PriceRegistryOwnershipTransferredIterator, error)); ok {
-		return rf(opts, from, to)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) *price_registry.PriceRegistryOwnershipTransferredIterator); ok {
-		r0 = rf(opts, from, to)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryOwnershipTransferredIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address, []common.Address) error); ok {
-		r1 = rf(opts, from, to)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterOwnershipTransferred_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterOwnershipTransferred'
-type PriceRegistryInterface_FilterOwnershipTransferred_Call struct {
-	*mock.Call
-}
-
-// FilterOwnershipTransferred is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - from []common.Address
-//   - to []common.Address
-func (_e *PriceRegistryInterface_Expecter) FilterOwnershipTransferred(opts interface{}, from interface{}, to interface{}) *PriceRegistryInterface_FilterOwnershipTransferred_Call {
-	return &PriceRegistryInterface_FilterOwnershipTransferred_Call{Call: _e.mock.On("FilterOwnershipTransferred", opts, from, to)}
-}
-
-func (_c *PriceRegistryInterface_FilterOwnershipTransferred_Call) Run(run func(opts *bind.FilterOpts, from []common.Address, to []common.Address)) *PriceRegistryInterface_FilterOwnershipTransferred_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]common.Address), args[2].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterOwnershipTransferred_Call) Return(_a0 *price_registry.PriceRegistryOwnershipTransferredIterator, _a1 error) *PriceRegistryInterface_FilterOwnershipTransferred_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterOwnershipTransferred_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address, []common.Address) (*price_registry.PriceRegistryOwnershipTransferredIterator, error)) *PriceRegistryInterface_FilterOwnershipTransferred_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterPremiumMultiplierWeiPerEthUpdated provides a mock function with given fields: opts, token
-func (_m *PriceRegistryInterface) FilterPremiumMultiplierWeiPerEthUpdated(opts *bind.FilterOpts, token []common.Address) (*price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator, error) {
-	ret := _m.Called(opts, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterPremiumMultiplierWeiPerEthUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator, error)); ok {
-		return rf(opts, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator); ok {
-		r0 = rf(opts, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address) error); ok {
-		r1 = rf(opts, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterPremiumMultiplierWeiPerEthUpdated'
-type PriceRegistryInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call struct {
-	*mock.Call
-}
-
-// FilterPremiumMultiplierWeiPerEthUpdated is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - token []common.Address
-func (_e *PriceRegistryInterface_Expecter) FilterPremiumMultiplierWeiPerEthUpdated(opts interface{}, token interface{}) *PriceRegistryInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call {
-	return &PriceRegistryInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call{Call: _e.mock.On("FilterPremiumMultiplierWeiPerEthUpdated", opts, token)}
-}
-
-func (_c *PriceRegistryInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call) Run(run func(opts *bind.FilterOpts, token []common.Address)) *PriceRegistryInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call) Return(_a0 *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator, _a1 error) *PriceRegistryInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address) (*price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdatedIterator, error)) *PriceRegistryInterface_FilterPremiumMultiplierWeiPerEthUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterPriceFeedPerTokenUpdated provides a mock function with given fields: opts, token
-func (_m *PriceRegistryInterface) FilterPriceFeedPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*price_registry.PriceRegistryPriceFeedPerTokenUpdatedIterator, error) {
-	ret := _m.Called(opts, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterPriceFeedPerTokenUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryPriceFeedPerTokenUpdatedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*price_registry.PriceRegistryPriceFeedPerTokenUpdatedIterator, error)); ok {
-		return rf(opts, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) *price_registry.PriceRegistryPriceFeedPerTokenUpdatedIterator); ok {
-		r0 = rf(opts, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryPriceFeedPerTokenUpdatedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address) error); ok {
-		r1 = rf(opts, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterPriceFeedPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterPriceFeedPerTokenUpdated'
-type PriceRegistryInterface_FilterPriceFeedPerTokenUpdated_Call struct {
-	*mock.Call
-}
-
-// FilterPriceFeedPerTokenUpdated is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - token []common.Address
-func (_e *PriceRegistryInterface_Expecter) FilterPriceFeedPerTokenUpdated(opts interface{}, token interface{}) *PriceRegistryInterface_FilterPriceFeedPerTokenUpdated_Call {
-	return &PriceRegistryInterface_FilterPriceFeedPerTokenUpdated_Call{Call: _e.mock.On("FilterPriceFeedPerTokenUpdated", opts, token)}
-}
-
-func (_c *PriceRegistryInterface_FilterPriceFeedPerTokenUpdated_Call) Run(run func(opts *bind.FilterOpts, token []common.Address)) *PriceRegistryInterface_FilterPriceFeedPerTokenUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterPriceFeedPerTokenUpdated_Call) Return(_a0 *price_registry.PriceRegistryPriceFeedPerTokenUpdatedIterator, _a1 error) *PriceRegistryInterface_FilterPriceFeedPerTokenUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterPriceFeedPerTokenUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address) (*price_registry.PriceRegistryPriceFeedPerTokenUpdatedIterator, error)) *PriceRegistryInterface_FilterPriceFeedPerTokenUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterReportPermissionSet provides a mock function with given fields: opts, reportId
-func (_m *PriceRegistryInterface) FilterReportPermissionSet(opts *bind.FilterOpts, reportId [][32]byte) (*price_registry.PriceRegistryReportPermissionSetIterator, error) {
-	ret := _m.Called(opts, reportId)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterReportPermissionSet")
-	}
-
-	var r0 *price_registry.PriceRegistryReportPermissionSetIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, [][32]byte) (*price_registry.PriceRegistryReportPermissionSetIterator, error)); ok {
-		return rf(opts, reportId)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, [][32]byte) *price_registry.PriceRegistryReportPermissionSetIterator); ok {
-		r0 = rf(opts, reportId)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryReportPermissionSetIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, [][32]byte) error); ok {
-		r1 = rf(opts, reportId)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterReportPermissionSet_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterReportPermissionSet'
-type PriceRegistryInterface_FilterReportPermissionSet_Call struct {
-	*mock.Call
-}
-
-// FilterReportPermissionSet is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - reportId [][32]byte
-func (_e *PriceRegistryInterface_Expecter) FilterReportPermissionSet(opts interface{}, reportId interface{}) *PriceRegistryInterface_FilterReportPermissionSet_Call {
-	return &PriceRegistryInterface_FilterReportPermissionSet_Call{Call: _e.mock.On("FilterReportPermissionSet", opts, reportId)}
-}
-
-func (_c *PriceRegistryInterface_FilterReportPermissionSet_Call) Run(run func(opts *bind.FilterOpts, reportId [][32]byte)) *PriceRegistryInterface_FilterReportPermissionSet_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([][32]byte))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterReportPermissionSet_Call) Return(_a0 *price_registry.PriceRegistryReportPermissionSetIterator, _a1 error) *PriceRegistryInterface_FilterReportPermissionSet_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterReportPermissionSet_Call) RunAndReturn(run func(*bind.FilterOpts, [][32]byte) (*price_registry.PriceRegistryReportPermissionSetIterator, error)) *PriceRegistryInterface_FilterReportPermissionSet_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterTokenTransferFeeConfigDeleted provides a mock function with given fields: opts, destChainSelector, token
-func (_m *PriceRegistryInterface) FilterTokenTransferFeeConfigDeleted(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*price_registry.PriceRegistryTokenTransferFeeConfigDeletedIterator, error) {
-	ret := _m.Called(opts, destChainSelector, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterTokenTransferFeeConfigDeleted")
-	}
-
-	var r0 *price_registry.PriceRegistryTokenTransferFeeConfigDeletedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64, []common.Address) (*price_registry.PriceRegistryTokenTransferFeeConfigDeletedIterator, error)); ok {
-		return rf(opts, destChainSelector, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64, []common.Address) *price_registry.PriceRegistryTokenTransferFeeConfigDeletedIterator); ok {
-		r0 = rf(opts, destChainSelector, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryTokenTransferFeeConfigDeletedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []uint64, []common.Address) error); ok {
-		r1 = rf(opts, destChainSelector, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterTokenTransferFeeConfigDeleted_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterTokenTransferFeeConfigDeleted'
-type PriceRegistryInterface_FilterTokenTransferFeeConfigDeleted_Call struct {
-	*mock.Call
-}
-
-// FilterTokenTransferFeeConfigDeleted is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - destChainSelector []uint64
-//   - token []common.Address
-func (_e *PriceRegistryInterface_Expecter) FilterTokenTransferFeeConfigDeleted(opts interface{}, destChainSelector interface{}, token interface{}) *PriceRegistryInterface_FilterTokenTransferFeeConfigDeleted_Call {
-	return &PriceRegistryInterface_FilterTokenTransferFeeConfigDeleted_Call{Call: _e.mock.On("FilterTokenTransferFeeConfigDeleted", opts, destChainSelector, token)}
-}
-
-func (_c *PriceRegistryInterface_FilterTokenTransferFeeConfigDeleted_Call) Run(run func(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address)) *PriceRegistryInterface_FilterTokenTransferFeeConfigDeleted_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]uint64), args[2].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterTokenTransferFeeConfigDeleted_Call) Return(_a0 *price_registry.PriceRegistryTokenTransferFeeConfigDeletedIterator, _a1 error) *PriceRegistryInterface_FilterTokenTransferFeeConfigDeleted_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterTokenTransferFeeConfigDeleted_Call) RunAndReturn(run func(*bind.FilterOpts, []uint64, []common.Address) (*price_registry.PriceRegistryTokenTransferFeeConfigDeletedIterator, error)) *PriceRegistryInterface_FilterTokenTransferFeeConfigDeleted_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterTokenTransferFeeConfigUpdated provides a mock function with given fields: opts, destChainSelector, token
-func (_m *PriceRegistryInterface) FilterTokenTransferFeeConfigUpdated(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address) (*price_registry.PriceRegistryTokenTransferFeeConfigUpdatedIterator, error) {
-	ret := _m.Called(opts, destChainSelector, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterTokenTransferFeeConfigUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryTokenTransferFeeConfigUpdatedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64, []common.Address) (*price_registry.PriceRegistryTokenTransferFeeConfigUpdatedIterator, error)); ok {
-		return rf(opts, destChainSelector, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64, []common.Address) *price_registry.PriceRegistryTokenTransferFeeConfigUpdatedIterator); ok {
-		r0 = rf(opts, destChainSelector, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryTokenTransferFeeConfigUpdatedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []uint64, []common.Address) error); ok {
-		r1 = rf(opts, destChainSelector, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterTokenTransferFeeConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterTokenTransferFeeConfigUpdated'
-type PriceRegistryInterface_FilterTokenTransferFeeConfigUpdated_Call struct {
-	*mock.Call
-}
-
-// FilterTokenTransferFeeConfigUpdated is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - destChainSelector []uint64
-//   - token []common.Address
-func (_e *PriceRegistryInterface_Expecter) FilterTokenTransferFeeConfigUpdated(opts interface{}, destChainSelector interface{}, token interface{}) *PriceRegistryInterface_FilterTokenTransferFeeConfigUpdated_Call {
-	return &PriceRegistryInterface_FilterTokenTransferFeeConfigUpdated_Call{Call: _e.mock.On("FilterTokenTransferFeeConfigUpdated", opts, destChainSelector, token)}
-}
-
-func (_c *PriceRegistryInterface_FilterTokenTransferFeeConfigUpdated_Call) Run(run func(opts *bind.FilterOpts, destChainSelector []uint64, token []common.Address)) *PriceRegistryInterface_FilterTokenTransferFeeConfigUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]uint64), args[2].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterTokenTransferFeeConfigUpdated_Call) Return(_a0 *price_registry.PriceRegistryTokenTransferFeeConfigUpdatedIterator, _a1 error) *PriceRegistryInterface_FilterTokenTransferFeeConfigUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterTokenTransferFeeConfigUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []uint64, []common.Address) (*price_registry.PriceRegistryTokenTransferFeeConfigUpdatedIterator, error)) *PriceRegistryInterface_FilterTokenTransferFeeConfigUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterUsdPerTokenUpdated provides a mock function with given fields: opts, token
-func (_m *PriceRegistryInterface) FilterUsdPerTokenUpdated(opts *bind.FilterOpts, token []common.Address) (*price_registry.PriceRegistryUsdPerTokenUpdatedIterator, error) {
-	ret := _m.Called(opts, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterUsdPerTokenUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryUsdPerTokenUpdatedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*price_registry.PriceRegistryUsdPerTokenUpdatedIterator, error)); ok {
-		return rf(opts, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) *price_registry.PriceRegistryUsdPerTokenUpdatedIterator); ok {
-		r0 = rf(opts, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryUsdPerTokenUpdatedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []common.Address) error); ok {
-		r1 = rf(opts, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterUsdPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterUsdPerTokenUpdated'
-type PriceRegistryInterface_FilterUsdPerTokenUpdated_Call struct {
-	*mock.Call
-}
-
-// FilterUsdPerTokenUpdated is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - token []common.Address
-func (_e *PriceRegistryInterface_Expecter) FilterUsdPerTokenUpdated(opts interface{}, token interface{}) *PriceRegistryInterface_FilterUsdPerTokenUpdated_Call {
-	return &PriceRegistryInterface_FilterUsdPerTokenUpdated_Call{Call: _e.mock.On("FilterUsdPerTokenUpdated", opts, token)}
-}
-
-func (_c *PriceRegistryInterface_FilterUsdPerTokenUpdated_Call) Run(run func(opts *bind.FilterOpts, token []common.Address)) *PriceRegistryInterface_FilterUsdPerTokenUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterUsdPerTokenUpdated_Call) Return(_a0 *price_registry.PriceRegistryUsdPerTokenUpdatedIterator, _a1 error) *PriceRegistryInterface_FilterUsdPerTokenUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterUsdPerTokenUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []common.Address) (*price_registry.PriceRegistryUsdPerTokenUpdatedIterator, error)) *PriceRegistryInterface_FilterUsdPerTokenUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FilterUsdPerUnitGasUpdated provides a mock function with given fields: opts, destChain
-func (_m *PriceRegistryInterface) FilterUsdPerUnitGasUpdated(opts *bind.FilterOpts, destChain []uint64) (*price_registry.PriceRegistryUsdPerUnitGasUpdatedIterator, error) {
-	ret := _m.Called(opts, destChain)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FilterUsdPerUnitGasUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryUsdPerUnitGasUpdatedIterator
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*price_registry.PriceRegistryUsdPerUnitGasUpdatedIterator, error)); ok {
-		return rf(opts, destChain)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) *price_registry.PriceRegistryUsdPerUnitGasUpdatedIterator); ok {
-		r0 = rf(opts, destChain)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryUsdPerUnitGasUpdatedIterator)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.FilterOpts, []uint64) error); ok {
-		r1 = rf(opts, destChain)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_FilterUsdPerUnitGasUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FilterUsdPerUnitGasUpdated'
-type PriceRegistryInterface_FilterUsdPerUnitGasUpdated_Call struct {
-	*mock.Call
-}
-
-// FilterUsdPerUnitGasUpdated is a helper method to define mock.On call
-//   - opts *bind.FilterOpts
-//   - destChain []uint64
-func (_e *PriceRegistryInterface_Expecter) FilterUsdPerUnitGasUpdated(opts interface{}, destChain interface{}) *PriceRegistryInterface_FilterUsdPerUnitGasUpdated_Call {
-	return &PriceRegistryInterface_FilterUsdPerUnitGasUpdated_Call{Call: _e.mock.On("FilterUsdPerUnitGasUpdated", opts, destChain)}
-}
-
-func (_c *PriceRegistryInterface_FilterUsdPerUnitGasUpdated_Call) Run(run func(opts *bind.FilterOpts, destChain []uint64)) *PriceRegistryInterface_FilterUsdPerUnitGasUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.FilterOpts), args[1].([]uint64))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterUsdPerUnitGasUpdated_Call) Return(_a0 *price_registry.PriceRegistryUsdPerUnitGasUpdatedIterator, _a1 error) *PriceRegistryInterface_FilterUsdPerUnitGasUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_FilterUsdPerUnitGasUpdated_Call) RunAndReturn(run func(*bind.FilterOpts, []uint64) (*price_registry.PriceRegistryUsdPerUnitGasUpdatedIterator, error)) *PriceRegistryInterface_FilterUsdPerUnitGasUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetAllAuthorizedCallers provides a mock function with given fields: opts
-func (_m *PriceRegistryInterface) GetAllAuthorizedCallers(opts *bind.CallOpts) ([]common.Address, error) {
-	ret := _m.Called(opts)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetAllAuthorizedCallers")
-	}
-
-	var r0 []common.Address
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([]common.Address, error)); ok {
-		return rf(opts)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts) []common.Address); ok {
-		r0 = rf(opts)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]common.Address)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts) error); ok {
-		r1 = rf(opts)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetAllAuthorizedCallers_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetAllAuthorizedCallers'
-type PriceRegistryInterface_GetAllAuthorizedCallers_Call struct {
-	*mock.Call
-}
-
-// GetAllAuthorizedCallers is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-func (_e *PriceRegistryInterface_Expecter) GetAllAuthorizedCallers(opts interface{}) *PriceRegistryInterface_GetAllAuthorizedCallers_Call {
-	return &PriceRegistryInterface_GetAllAuthorizedCallers_Call{Call: _e.mock.On("GetAllAuthorizedCallers", opts)}
-}
-
-func (_c *PriceRegistryInterface_GetAllAuthorizedCallers_Call) Run(run func(opts *bind.CallOpts)) *PriceRegistryInterface_GetAllAuthorizedCallers_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetAllAuthorizedCallers_Call) Return(_a0 []common.Address, _a1 error) *PriceRegistryInterface_GetAllAuthorizedCallers_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetAllAuthorizedCallers_Call) RunAndReturn(run func(*bind.CallOpts) ([]common.Address, error)) *PriceRegistryInterface_GetAllAuthorizedCallers_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetDestChainConfig provides a mock function with given fields: opts, destChainSelector
-func (_m *PriceRegistryInterface) GetDestChainConfig(opts *bind.CallOpts, destChainSelector uint64) (price_registry.PriceRegistryDestChainConfig, error) {
-	ret := _m.Called(opts, destChainSelector)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetDestChainConfig")
-	}
-
-	var r0 price_registry.PriceRegistryDestChainConfig
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) (price_registry.PriceRegistryDestChainConfig, error)); ok {
-		return rf(opts, destChainSelector)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) price_registry.PriceRegistryDestChainConfig); ok {
-		r0 = rf(opts, destChainSelector)
-	} else {
-		r0 = ret.Get(0).(price_registry.PriceRegistryDestChainConfig)
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64) error); ok {
-		r1 = rf(opts, destChainSelector)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetDestChainConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDestChainConfig'
-type PriceRegistryInterface_GetDestChainConfig_Call struct {
-	*mock.Call
-}
-
-// GetDestChainConfig is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - destChainSelector uint64
-func (_e *PriceRegistryInterface_Expecter) GetDestChainConfig(opts interface{}, destChainSelector interface{}) *PriceRegistryInterface_GetDestChainConfig_Call {
-	return &PriceRegistryInterface_GetDestChainConfig_Call{Call: _e.mock.On("GetDestChainConfig", opts, destChainSelector)}
-}
-
-func (_c *PriceRegistryInterface_GetDestChainConfig_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64)) *PriceRegistryInterface_GetDestChainConfig_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(uint64))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetDestChainConfig_Call) Return(_a0 price_registry.PriceRegistryDestChainConfig, _a1 error) *PriceRegistryInterface_GetDestChainConfig_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetDestChainConfig_Call) RunAndReturn(run func(*bind.CallOpts, uint64) (price_registry.PriceRegistryDestChainConfig, error)) *PriceRegistryInterface_GetDestChainConfig_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetDestinationChainGasPrice provides a mock function with given fields: opts, destChainSelector
-func (_m *PriceRegistryInterface) GetDestinationChainGasPrice(opts *bind.CallOpts, destChainSelector uint64) (price_registry.InternalTimestampedPackedUint224, error) {
-	ret := _m.Called(opts, destChainSelector)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetDestinationChainGasPrice")
-	}
-
-	var r0 price_registry.InternalTimestampedPackedUint224
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) (price_registry.InternalTimestampedPackedUint224, error)); ok {
-		return rf(opts, destChainSelector)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) price_registry.InternalTimestampedPackedUint224); ok {
-		r0 = rf(opts, destChainSelector)
-	} else {
-		r0 = ret.Get(0).(price_registry.InternalTimestampedPackedUint224)
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64) error); ok {
-		r1 = rf(opts, destChainSelector)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetDestinationChainGasPrice_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDestinationChainGasPrice'
-type PriceRegistryInterface_GetDestinationChainGasPrice_Call struct {
-	*mock.Call
-}
-
-// GetDestinationChainGasPrice is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - destChainSelector uint64
-func (_e *PriceRegistryInterface_Expecter) GetDestinationChainGasPrice(opts interface{}, destChainSelector interface{}) *PriceRegistryInterface_GetDestinationChainGasPrice_Call {
-	return &PriceRegistryInterface_GetDestinationChainGasPrice_Call{Call: _e.mock.On("GetDestinationChainGasPrice", opts, destChainSelector)}
-}
-
-func (_c *PriceRegistryInterface_GetDestinationChainGasPrice_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64)) *PriceRegistryInterface_GetDestinationChainGasPrice_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(uint64))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetDestinationChainGasPrice_Call) Return(_a0 price_registry.InternalTimestampedPackedUint224, _a1 error) *PriceRegistryInterface_GetDestinationChainGasPrice_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetDestinationChainGasPrice_Call) RunAndReturn(run func(*bind.CallOpts, uint64) (price_registry.InternalTimestampedPackedUint224, error)) *PriceRegistryInterface_GetDestinationChainGasPrice_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetFeeTokens provides a mock function with given fields: opts
-func (_m *PriceRegistryInterface) GetFeeTokens(opts *bind.CallOpts) ([]common.Address, error) {
-	ret := _m.Called(opts)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetFeeTokens")
-	}
-
-	var r0 []common.Address
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([]common.Address, error)); ok {
-		return rf(opts)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts) []common.Address); ok {
-		r0 = rf(opts)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]common.Address)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts) error); ok {
-		r1 = rf(opts)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetFeeTokens_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetFeeTokens'
-type PriceRegistryInterface_GetFeeTokens_Call struct {
-	*mock.Call
-}
-
-// GetFeeTokens is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-func (_e *PriceRegistryInterface_Expecter) GetFeeTokens(opts interface{}) *PriceRegistryInterface_GetFeeTokens_Call {
-	return &PriceRegistryInterface_GetFeeTokens_Call{Call: _e.mock.On("GetFeeTokens", opts)}
-}
-
-func (_c *PriceRegistryInterface_GetFeeTokens_Call) Run(run func(opts *bind.CallOpts)) *PriceRegistryInterface_GetFeeTokens_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetFeeTokens_Call) Return(_a0 []common.Address, _a1 error) *PriceRegistryInterface_GetFeeTokens_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetFeeTokens_Call) RunAndReturn(run func(*bind.CallOpts) ([]common.Address, error)) *PriceRegistryInterface_GetFeeTokens_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetPremiumMultiplierWeiPerEth provides a mock function with given fields: opts, token
-func (_m *PriceRegistryInterface) GetPremiumMultiplierWeiPerEth(opts *bind.CallOpts, token common.Address) (uint64, error) {
-	ret := _m.Called(opts, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetPremiumMultiplierWeiPerEth")
-	}
-
-	var r0 uint64
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (uint64, error)); ok {
-		return rf(opts, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) uint64); ok {
-		r0 = rf(opts, token)
-	} else {
-		r0 = ret.Get(0).(uint64)
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address) error); ok {
-		r1 = rf(opts, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetPremiumMultiplierWeiPerEth_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetPremiumMultiplierWeiPerEth'
-type PriceRegistryInterface_GetPremiumMultiplierWeiPerEth_Call struct {
-	*mock.Call
-}
-
-// GetPremiumMultiplierWeiPerEth is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - token common.Address
-func (_e *PriceRegistryInterface_Expecter) GetPremiumMultiplierWeiPerEth(opts interface{}, token interface{}) *PriceRegistryInterface_GetPremiumMultiplierWeiPerEth_Call {
-	return &PriceRegistryInterface_GetPremiumMultiplierWeiPerEth_Call{Call: _e.mock.On("GetPremiumMultiplierWeiPerEth", opts, token)}
-}
-
-func (_c *PriceRegistryInterface_GetPremiumMultiplierWeiPerEth_Call) Run(run func(opts *bind.CallOpts, token common.Address)) *PriceRegistryInterface_GetPremiumMultiplierWeiPerEth_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetPremiumMultiplierWeiPerEth_Call) Return(_a0 uint64, _a1 error) *PriceRegistryInterface_GetPremiumMultiplierWeiPerEth_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetPremiumMultiplierWeiPerEth_Call) RunAndReturn(run func(*bind.CallOpts, common.Address) (uint64, error)) *PriceRegistryInterface_GetPremiumMultiplierWeiPerEth_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetStaticConfig provides a mock function with given fields: opts
-func (_m *PriceRegistryInterface) GetStaticConfig(opts *bind.CallOpts) (price_registry.PriceRegistryStaticConfig, error) {
-	ret := _m.Called(opts)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetStaticConfig")
-	}
-
-	var r0 price_registry.PriceRegistryStaticConfig
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (price_registry.PriceRegistryStaticConfig, error)); ok {
-		return rf(opts)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts) price_registry.PriceRegistryStaticConfig); ok {
-		r0 = rf(opts)
-	} else {
-		r0 = ret.Get(0).(price_registry.PriceRegistryStaticConfig)
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts) error); ok {
-		r1 = rf(opts)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetStaticConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetStaticConfig'
-type PriceRegistryInterface_GetStaticConfig_Call struct {
-	*mock.Call
-}
-
-// GetStaticConfig is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-func (_e *PriceRegistryInterface_Expecter) GetStaticConfig(opts interface{}) *PriceRegistryInterface_GetStaticConfig_Call {
-	return &PriceRegistryInterface_GetStaticConfig_Call{Call: _e.mock.On("GetStaticConfig", opts)}
-}
-
-func (_c *PriceRegistryInterface_GetStaticConfig_Call) Run(run func(opts *bind.CallOpts)) *PriceRegistryInterface_GetStaticConfig_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetStaticConfig_Call) Return(_a0 price_registry.PriceRegistryStaticConfig, _a1 error) *PriceRegistryInterface_GetStaticConfig_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetStaticConfig_Call) RunAndReturn(run func(*bind.CallOpts) (price_registry.PriceRegistryStaticConfig, error)) *PriceRegistryInterface_GetStaticConfig_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetTokenAndGasPrices provides a mock function with given fields: opts, token, destChainSelector
-func (_m *PriceRegistryInterface) GetTokenAndGasPrices(opts *bind.CallOpts, token common.Address, destChainSelector uint64) (price_registry.GetTokenAndGasPrices, error) {
-	ret := _m.Called(opts, token, destChainSelector)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetTokenAndGasPrices")
-	}
-
-	var r0 price_registry.GetTokenAndGasPrices
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, uint64) (price_registry.GetTokenAndGasPrices, error)); ok {
-		return rf(opts, token, destChainSelector)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, uint64) price_registry.GetTokenAndGasPrices); ok {
-		r0 = rf(opts, token, destChainSelector)
-	} else {
-		r0 = ret.Get(0).(price_registry.GetTokenAndGasPrices)
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address, uint64) error); ok {
-		r1 = rf(opts, token, destChainSelector)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetTokenAndGasPrices_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTokenAndGasPrices'
-type PriceRegistryInterface_GetTokenAndGasPrices_Call struct {
-	*mock.Call
-}
-
-// GetTokenAndGasPrices is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - token common.Address
-//   - destChainSelector uint64
-func (_e *PriceRegistryInterface_Expecter) GetTokenAndGasPrices(opts interface{}, token interface{}, destChainSelector interface{}) *PriceRegistryInterface_GetTokenAndGasPrices_Call {
-	return &PriceRegistryInterface_GetTokenAndGasPrices_Call{Call: _e.mock.On("GetTokenAndGasPrices", opts, token, destChainSelector)}
-}
-
-func (_c *PriceRegistryInterface_GetTokenAndGasPrices_Call) Run(run func(opts *bind.CallOpts, token common.Address, destChainSelector uint64)) *PriceRegistryInterface_GetTokenAndGasPrices_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(common.Address), args[2].(uint64))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetTokenAndGasPrices_Call) Return(_a0 price_registry.GetTokenAndGasPrices, _a1 error) *PriceRegistryInterface_GetTokenAndGasPrices_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetTokenAndGasPrices_Call) RunAndReturn(run func(*bind.CallOpts, common.Address, uint64) (price_registry.GetTokenAndGasPrices, error)) *PriceRegistryInterface_GetTokenAndGasPrices_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetTokenPrice provides a mock function with given fields: opts, token
-func (_m *PriceRegistryInterface) GetTokenPrice(opts *bind.CallOpts, token common.Address) (price_registry.InternalTimestampedPackedUint224, error) {
-	ret := _m.Called(opts, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetTokenPrice")
-	}
-
-	var r0 price_registry.InternalTimestampedPackedUint224
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (price_registry.InternalTimestampedPackedUint224, error)); ok {
-		return rf(opts, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) price_registry.InternalTimestampedPackedUint224); ok {
-		r0 = rf(opts, token)
-	} else {
-		r0 = ret.Get(0).(price_registry.InternalTimestampedPackedUint224)
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address) error); ok {
-		r1 = rf(opts, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetTokenPrice_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTokenPrice'
-type PriceRegistryInterface_GetTokenPrice_Call struct {
-	*mock.Call
-}
-
-// GetTokenPrice is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - token common.Address
-func (_e *PriceRegistryInterface_Expecter) GetTokenPrice(opts interface{}, token interface{}) *PriceRegistryInterface_GetTokenPrice_Call {
-	return &PriceRegistryInterface_GetTokenPrice_Call{Call: _e.mock.On("GetTokenPrice", opts, token)}
-}
-
-func (_c *PriceRegistryInterface_GetTokenPrice_Call) Run(run func(opts *bind.CallOpts, token common.Address)) *PriceRegistryInterface_GetTokenPrice_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetTokenPrice_Call) Return(_a0 price_registry.InternalTimestampedPackedUint224, _a1 error) *PriceRegistryInterface_GetTokenPrice_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetTokenPrice_Call) RunAndReturn(run func(*bind.CallOpts, common.Address) (price_registry.InternalTimestampedPackedUint224, error)) *PriceRegistryInterface_GetTokenPrice_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetTokenPriceFeedConfig provides a mock function with given fields: opts, token
-func (_m *PriceRegistryInterface) GetTokenPriceFeedConfig(opts *bind.CallOpts, token common.Address) (price_registry.IPriceRegistryTokenPriceFeedConfig, error) {
-	ret := _m.Called(opts, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetTokenPriceFeedConfig")
-	}
-
-	var r0 price_registry.IPriceRegistryTokenPriceFeedConfig
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (price_registry.IPriceRegistryTokenPriceFeedConfig, error)); ok {
-		return rf(opts, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) price_registry.IPriceRegistryTokenPriceFeedConfig); ok {
-		r0 = rf(opts, token)
-	} else {
-		r0 = ret.Get(0).(price_registry.IPriceRegistryTokenPriceFeedConfig)
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address) error); ok {
-		r1 = rf(opts, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetTokenPriceFeedConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTokenPriceFeedConfig'
-type PriceRegistryInterface_GetTokenPriceFeedConfig_Call struct {
-	*mock.Call
-}
-
-// GetTokenPriceFeedConfig is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - token common.Address
-func (_e *PriceRegistryInterface_Expecter) GetTokenPriceFeedConfig(opts interface{}, token interface{}) *PriceRegistryInterface_GetTokenPriceFeedConfig_Call {
-	return &PriceRegistryInterface_GetTokenPriceFeedConfig_Call{Call: _e.mock.On("GetTokenPriceFeedConfig", opts, token)}
-}
-
-func (_c *PriceRegistryInterface_GetTokenPriceFeedConfig_Call) Run(run func(opts *bind.CallOpts, token common.Address)) *PriceRegistryInterface_GetTokenPriceFeedConfig_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetTokenPriceFeedConfig_Call) Return(_a0 price_registry.IPriceRegistryTokenPriceFeedConfig, _a1 error) *PriceRegistryInterface_GetTokenPriceFeedConfig_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetTokenPriceFeedConfig_Call) RunAndReturn(run func(*bind.CallOpts, common.Address) (price_registry.IPriceRegistryTokenPriceFeedConfig, error)) *PriceRegistryInterface_GetTokenPriceFeedConfig_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetTokenPrices provides a mock function with given fields: opts, tokens
-func (_m *PriceRegistryInterface) GetTokenPrices(opts *bind.CallOpts, tokens []common.Address) ([]price_registry.InternalTimestampedPackedUint224, error) {
-	ret := _m.Called(opts, tokens)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetTokenPrices")
-	}
-
-	var r0 []price_registry.InternalTimestampedPackedUint224
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, []common.Address) ([]price_registry.InternalTimestampedPackedUint224, error)); ok {
-		return rf(opts, tokens)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, []common.Address) []price_registry.InternalTimestampedPackedUint224); ok {
-		r0 = rf(opts, tokens)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]price_registry.InternalTimestampedPackedUint224)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, []common.Address) error); ok {
-		r1 = rf(opts, tokens)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetTokenPrices_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTokenPrices'
-type PriceRegistryInterface_GetTokenPrices_Call struct {
-	*mock.Call
-}
-
-// GetTokenPrices is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - tokens []common.Address
-func (_e *PriceRegistryInterface_Expecter) GetTokenPrices(opts interface{}, tokens interface{}) *PriceRegistryInterface_GetTokenPrices_Call {
-	return &PriceRegistryInterface_GetTokenPrices_Call{Call: _e.mock.On("GetTokenPrices", opts, tokens)}
-}
-
-func (_c *PriceRegistryInterface_GetTokenPrices_Call) Run(run func(opts *bind.CallOpts, tokens []common.Address)) *PriceRegistryInterface_GetTokenPrices_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetTokenPrices_Call) Return(_a0 []price_registry.InternalTimestampedPackedUint224, _a1 error) *PriceRegistryInterface_GetTokenPrices_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetTokenPrices_Call) RunAndReturn(run func(*bind.CallOpts, []common.Address) ([]price_registry.InternalTimestampedPackedUint224, error)) *PriceRegistryInterface_GetTokenPrices_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetTokenTransferFeeConfig provides a mock function with given fields: opts, destChainSelector, token
-func (_m *PriceRegistryInterface) GetTokenTransferFeeConfig(opts *bind.CallOpts, destChainSelector uint64, token common.Address) (price_registry.PriceRegistryTokenTransferFeeConfig, error) {
-	ret := _m.Called(opts, destChainSelector, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetTokenTransferFeeConfig")
-	}
-
-	var r0 price_registry.PriceRegistryTokenTransferFeeConfig
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, common.Address) (price_registry.PriceRegistryTokenTransferFeeConfig, error)); ok {
-		return rf(opts, destChainSelector, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, common.Address) price_registry.PriceRegistryTokenTransferFeeConfig); ok {
-		r0 = rf(opts, destChainSelector, token)
-	} else {
-		r0 = ret.Get(0).(price_registry.PriceRegistryTokenTransferFeeConfig)
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64, common.Address) error); ok {
-		r1 = rf(opts, destChainSelector, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetTokenTransferFeeConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTokenTransferFeeConfig'
-type PriceRegistryInterface_GetTokenTransferFeeConfig_Call struct {
-	*mock.Call
-}
-
-// GetTokenTransferFeeConfig is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - destChainSelector uint64
-//   - token common.Address
-func (_e *PriceRegistryInterface_Expecter) GetTokenTransferFeeConfig(opts interface{}, destChainSelector interface{}, token interface{}) *PriceRegistryInterface_GetTokenTransferFeeConfig_Call {
-	return &PriceRegistryInterface_GetTokenTransferFeeConfig_Call{Call: _e.mock.On("GetTokenTransferFeeConfig", opts, destChainSelector, token)}
-}
-
-func (_c *PriceRegistryInterface_GetTokenTransferFeeConfig_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64, token common.Address)) *PriceRegistryInterface_GetTokenTransferFeeConfig_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(uint64), args[2].(common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetTokenTransferFeeConfig_Call) Return(_a0 price_registry.PriceRegistryTokenTransferFeeConfig, _a1 error) *PriceRegistryInterface_GetTokenTransferFeeConfig_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetTokenTransferFeeConfig_Call) RunAndReturn(run func(*bind.CallOpts, uint64, common.Address) (price_registry.PriceRegistryTokenTransferFeeConfig, error)) *PriceRegistryInterface_GetTokenTransferFeeConfig_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetValidatedFee provides a mock function with given fields: opts, destChainSelector, message
-func (_m *PriceRegistryInterface) GetValidatedFee(opts *bind.CallOpts, destChainSelector uint64, message price_registry.ClientEVM2AnyMessage) (*big.Int, error) {
-	ret := _m.Called(opts, destChainSelector, message)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetValidatedFee")
-	}
-
-	var r0 *big.Int
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, price_registry.ClientEVM2AnyMessage) (*big.Int, error)); ok {
-		return rf(opts, destChainSelector, message)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, price_registry.ClientEVM2AnyMessage) *big.Int); ok {
-		r0 = rf(opts, destChainSelector, message)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*big.Int)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64, price_registry.ClientEVM2AnyMessage) error); ok {
-		r1 = rf(opts, destChainSelector, message)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetValidatedFee_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetValidatedFee'
-type PriceRegistryInterface_GetValidatedFee_Call struct {
-	*mock.Call
-}
-
-// GetValidatedFee is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - destChainSelector uint64
-//   - message price_registry.ClientEVM2AnyMessage
-func (_e *PriceRegistryInterface_Expecter) GetValidatedFee(opts interface{}, destChainSelector interface{}, message interface{}) *PriceRegistryInterface_GetValidatedFee_Call {
-	return &PriceRegistryInterface_GetValidatedFee_Call{Call: _e.mock.On("GetValidatedFee", opts, destChainSelector, message)}
-}
-
-func (_c *PriceRegistryInterface_GetValidatedFee_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64, message price_registry.ClientEVM2AnyMessage)) *PriceRegistryInterface_GetValidatedFee_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(uint64), args[2].(price_registry.ClientEVM2AnyMessage))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetValidatedFee_Call) Return(_a0 *big.Int, _a1 error) *PriceRegistryInterface_GetValidatedFee_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetValidatedFee_Call) RunAndReturn(run func(*bind.CallOpts, uint64, price_registry.ClientEVM2AnyMessage) (*big.Int, error)) *PriceRegistryInterface_GetValidatedFee_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetValidatedTokenPrice provides a mock function with given fields: opts, token
-func (_m *PriceRegistryInterface) GetValidatedTokenPrice(opts *bind.CallOpts, token common.Address) (*big.Int, error) {
-	ret := _m.Called(opts, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetValidatedTokenPrice")
-	}
-
-	var r0 *big.Int
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (*big.Int, error)); ok {
-		return rf(opts, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) *big.Int); ok {
-		r0 = rf(opts, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*big.Int)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, common.Address) error); ok {
-		r1 = rf(opts, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_GetValidatedTokenPrice_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetValidatedTokenPrice'
-type PriceRegistryInterface_GetValidatedTokenPrice_Call struct {
-	*mock.Call
-}
-
-// GetValidatedTokenPrice is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - token common.Address
-func (_e *PriceRegistryInterface_Expecter) GetValidatedTokenPrice(opts interface{}, token interface{}) *PriceRegistryInterface_GetValidatedTokenPrice_Call {
-	return &PriceRegistryInterface_GetValidatedTokenPrice_Call{Call: _e.mock.On("GetValidatedTokenPrice", opts, token)}
-}
-
-func (_c *PriceRegistryInterface_GetValidatedTokenPrice_Call) Run(run func(opts *bind.CallOpts, token common.Address)) *PriceRegistryInterface_GetValidatedTokenPrice_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetValidatedTokenPrice_Call) Return(_a0 *big.Int, _a1 error) *PriceRegistryInterface_GetValidatedTokenPrice_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_GetValidatedTokenPrice_Call) RunAndReturn(run func(*bind.CallOpts, common.Address) (*big.Int, error)) *PriceRegistryInterface_GetValidatedTokenPrice_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// OnReport provides a mock function with given fields: opts, metadata, report
-func (_m *PriceRegistryInterface) OnReport(opts *bind.TransactOpts, metadata []byte, report []byte) (*types.Transaction, error) {
-	ret := _m.Called(opts, metadata, report)
-
-	if len(ret) == 0 {
-		panic("no return value specified for OnReport")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []byte, []byte) (*types.Transaction, error)); ok {
-		return rf(opts, metadata, report)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []byte, []byte) *types.Transaction); ok {
-		r0 = rf(opts, metadata, report)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []byte, []byte) error); ok {
-		r1 = rf(opts, metadata, report)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_OnReport_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'OnReport'
-type PriceRegistryInterface_OnReport_Call struct {
-	*mock.Call
-}
-
-// OnReport is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-//   - metadata []byte
-//   - report []byte
-func (_e *PriceRegistryInterface_Expecter) OnReport(opts interface{}, metadata interface{}, report interface{}) *PriceRegistryInterface_OnReport_Call {
-	return &PriceRegistryInterface_OnReport_Call{Call: _e.mock.On("OnReport", opts, metadata, report)}
-}
-
-func (_c *PriceRegistryInterface_OnReport_Call) Run(run func(opts *bind.TransactOpts, metadata []byte, report []byte)) *PriceRegistryInterface_OnReport_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts), args[1].([]byte), args[2].([]byte))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_OnReport_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_OnReport_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_OnReport_Call) RunAndReturn(run func(*bind.TransactOpts, []byte, []byte) (*types.Transaction, error)) *PriceRegistryInterface_OnReport_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Owner provides a mock function with given fields: opts
-func (_m *PriceRegistryInterface) Owner(opts *bind.CallOpts) (common.Address, error) {
-	ret := _m.Called(opts)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Owner")
-	}
-
-	var r0 common.Address
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
-		return rf(opts)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts) common.Address); ok {
-		r0 = rf(opts)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(common.Address)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts) error); ok {
-		r1 = rf(opts)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_Owner_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Owner'
-type PriceRegistryInterface_Owner_Call struct {
-	*mock.Call
-}
-
-// Owner is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-func (_e *PriceRegistryInterface_Expecter) Owner(opts interface{}) *PriceRegistryInterface_Owner_Call {
-	return &PriceRegistryInterface_Owner_Call{Call: _e.mock.On("Owner", opts)}
-}
-
-func (_c *PriceRegistryInterface_Owner_Call) Run(run func(opts *bind.CallOpts)) *PriceRegistryInterface_Owner_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_Owner_Call) Return(_a0 common.Address, _a1 error) *PriceRegistryInterface_Owner_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_Owner_Call) RunAndReturn(run func(*bind.CallOpts) (common.Address, error)) *PriceRegistryInterface_Owner_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseAuthorizedCallerAdded provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseAuthorizedCallerAdded(log types.Log) (*price_registry.PriceRegistryAuthorizedCallerAdded, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseAuthorizedCallerAdded")
-	}
-
-	var r0 *price_registry.PriceRegistryAuthorizedCallerAdded
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryAuthorizedCallerAdded, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryAuthorizedCallerAdded); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryAuthorizedCallerAdded)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseAuthorizedCallerAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseAuthorizedCallerAdded'
-type PriceRegistryInterface_ParseAuthorizedCallerAdded_Call struct {
-	*mock.Call
-}
-
-// ParseAuthorizedCallerAdded is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseAuthorizedCallerAdded(log interface{}) *PriceRegistryInterface_ParseAuthorizedCallerAdded_Call {
-	return &PriceRegistryInterface_ParseAuthorizedCallerAdded_Call{Call: _e.mock.On("ParseAuthorizedCallerAdded", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseAuthorizedCallerAdded_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseAuthorizedCallerAdded_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseAuthorizedCallerAdded_Call) Return(_a0 *price_registry.PriceRegistryAuthorizedCallerAdded, _a1 error) *PriceRegistryInterface_ParseAuthorizedCallerAdded_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseAuthorizedCallerAdded_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryAuthorizedCallerAdded, error)) *PriceRegistryInterface_ParseAuthorizedCallerAdded_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseAuthorizedCallerRemoved provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseAuthorizedCallerRemoved(log types.Log) (*price_registry.PriceRegistryAuthorizedCallerRemoved, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseAuthorizedCallerRemoved")
-	}
-
-	var r0 *price_registry.PriceRegistryAuthorizedCallerRemoved
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryAuthorizedCallerRemoved, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryAuthorizedCallerRemoved); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryAuthorizedCallerRemoved)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseAuthorizedCallerRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseAuthorizedCallerRemoved'
-type PriceRegistryInterface_ParseAuthorizedCallerRemoved_Call struct {
-	*mock.Call
-}
-
-// ParseAuthorizedCallerRemoved is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseAuthorizedCallerRemoved(log interface{}) *PriceRegistryInterface_ParseAuthorizedCallerRemoved_Call {
-	return &PriceRegistryInterface_ParseAuthorizedCallerRemoved_Call{Call: _e.mock.On("ParseAuthorizedCallerRemoved", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseAuthorizedCallerRemoved_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseAuthorizedCallerRemoved_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseAuthorizedCallerRemoved_Call) Return(_a0 *price_registry.PriceRegistryAuthorizedCallerRemoved, _a1 error) *PriceRegistryInterface_ParseAuthorizedCallerRemoved_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseAuthorizedCallerRemoved_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryAuthorizedCallerRemoved, error)) *PriceRegistryInterface_ParseAuthorizedCallerRemoved_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseDestChainAdded provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseDestChainAdded(log types.Log) (*price_registry.PriceRegistryDestChainAdded, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseDestChainAdded")
-	}
-
-	var r0 *price_registry.PriceRegistryDestChainAdded
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryDestChainAdded, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryDestChainAdded); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryDestChainAdded)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseDestChainAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseDestChainAdded'
-type PriceRegistryInterface_ParseDestChainAdded_Call struct {
-	*mock.Call
-}
-
-// ParseDestChainAdded is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseDestChainAdded(log interface{}) *PriceRegistryInterface_ParseDestChainAdded_Call {
-	return &PriceRegistryInterface_ParseDestChainAdded_Call{Call: _e.mock.On("ParseDestChainAdded", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseDestChainAdded_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseDestChainAdded_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseDestChainAdded_Call) Return(_a0 *price_registry.PriceRegistryDestChainAdded, _a1 error) *PriceRegistryInterface_ParseDestChainAdded_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseDestChainAdded_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryDestChainAdded, error)) *PriceRegistryInterface_ParseDestChainAdded_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseDestChainConfigUpdated provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseDestChainConfigUpdated(log types.Log) (*price_registry.PriceRegistryDestChainConfigUpdated, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseDestChainConfigUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryDestChainConfigUpdated
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryDestChainConfigUpdated, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryDestChainConfigUpdated); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryDestChainConfigUpdated)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseDestChainConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseDestChainConfigUpdated'
-type PriceRegistryInterface_ParseDestChainConfigUpdated_Call struct {
-	*mock.Call
-}
-
-// ParseDestChainConfigUpdated is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseDestChainConfigUpdated(log interface{}) *PriceRegistryInterface_ParseDestChainConfigUpdated_Call {
-	return &PriceRegistryInterface_ParseDestChainConfigUpdated_Call{Call: _e.mock.On("ParseDestChainConfigUpdated", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseDestChainConfigUpdated_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseDestChainConfigUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseDestChainConfigUpdated_Call) Return(_a0 *price_registry.PriceRegistryDestChainConfigUpdated, _a1 error) *PriceRegistryInterface_ParseDestChainConfigUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseDestChainConfigUpdated_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryDestChainConfigUpdated, error)) *PriceRegistryInterface_ParseDestChainConfigUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseFeeTokenAdded provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseFeeTokenAdded(log types.Log) (*price_registry.PriceRegistryFeeTokenAdded, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseFeeTokenAdded")
-	}
-
-	var r0 *price_registry.PriceRegistryFeeTokenAdded
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryFeeTokenAdded, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryFeeTokenAdded); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryFeeTokenAdded)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseFeeTokenAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseFeeTokenAdded'
-type PriceRegistryInterface_ParseFeeTokenAdded_Call struct {
-	*mock.Call
-}
-
-// ParseFeeTokenAdded is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseFeeTokenAdded(log interface{}) *PriceRegistryInterface_ParseFeeTokenAdded_Call {
-	return &PriceRegistryInterface_ParseFeeTokenAdded_Call{Call: _e.mock.On("ParseFeeTokenAdded", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseFeeTokenAdded_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseFeeTokenAdded_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseFeeTokenAdded_Call) Return(_a0 *price_registry.PriceRegistryFeeTokenAdded, _a1 error) *PriceRegistryInterface_ParseFeeTokenAdded_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseFeeTokenAdded_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryFeeTokenAdded, error)) *PriceRegistryInterface_ParseFeeTokenAdded_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseFeeTokenRemoved provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseFeeTokenRemoved(log types.Log) (*price_registry.PriceRegistryFeeTokenRemoved, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseFeeTokenRemoved")
-	}
-
-	var r0 *price_registry.PriceRegistryFeeTokenRemoved
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryFeeTokenRemoved, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryFeeTokenRemoved); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryFeeTokenRemoved)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseFeeTokenRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseFeeTokenRemoved'
-type PriceRegistryInterface_ParseFeeTokenRemoved_Call struct {
-	*mock.Call
-}
-
-// ParseFeeTokenRemoved is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseFeeTokenRemoved(log interface{}) *PriceRegistryInterface_ParseFeeTokenRemoved_Call {
-	return &PriceRegistryInterface_ParseFeeTokenRemoved_Call{Call: _e.mock.On("ParseFeeTokenRemoved", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseFeeTokenRemoved_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseFeeTokenRemoved_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseFeeTokenRemoved_Call) Return(_a0 *price_registry.PriceRegistryFeeTokenRemoved, _a1 error) *PriceRegistryInterface_ParseFeeTokenRemoved_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseFeeTokenRemoved_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryFeeTokenRemoved, error)) *PriceRegistryInterface_ParseFeeTokenRemoved_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseLog provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseLog(log types.Log) (generated.AbigenLog, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseLog")
-	}
-
-	var r0 generated.AbigenLog
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) generated.AbigenLog); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(generated.AbigenLog)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseLog_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseLog'
-type PriceRegistryInterface_ParseLog_Call struct {
-	*mock.Call
-}
-
-// ParseLog is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseLog(log interface{}) *PriceRegistryInterface_ParseLog_Call {
-	return &PriceRegistryInterface_ParseLog_Call{Call: _e.mock.On("ParseLog", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseLog_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseLog_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseLog_Call) Return(_a0 generated.AbigenLog, _a1 error) *PriceRegistryInterface_ParseLog_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseLog_Call) RunAndReturn(run func(types.Log) (generated.AbigenLog, error)) *PriceRegistryInterface_ParseLog_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseOwnershipTransferRequested provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseOwnershipTransferRequested(log types.Log) (*price_registry.PriceRegistryOwnershipTransferRequested, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseOwnershipTransferRequested")
-	}
-
-	var r0 *price_registry.PriceRegistryOwnershipTransferRequested
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryOwnershipTransferRequested, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryOwnershipTransferRequested); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryOwnershipTransferRequested)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseOwnershipTransferRequested_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseOwnershipTransferRequested'
-type PriceRegistryInterface_ParseOwnershipTransferRequested_Call struct {
-	*mock.Call
-}
-
-// ParseOwnershipTransferRequested is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseOwnershipTransferRequested(log interface{}) *PriceRegistryInterface_ParseOwnershipTransferRequested_Call {
-	return &PriceRegistryInterface_ParseOwnershipTransferRequested_Call{Call: _e.mock.On("ParseOwnershipTransferRequested", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseOwnershipTransferRequested_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseOwnershipTransferRequested_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseOwnershipTransferRequested_Call) Return(_a0 *price_registry.PriceRegistryOwnershipTransferRequested, _a1 error) *PriceRegistryInterface_ParseOwnershipTransferRequested_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseOwnershipTransferRequested_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryOwnershipTransferRequested, error)) *PriceRegistryInterface_ParseOwnershipTransferRequested_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseOwnershipTransferred provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseOwnershipTransferred(log types.Log) (*price_registry.PriceRegistryOwnershipTransferred, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseOwnershipTransferred")
-	}
-
-	var r0 *price_registry.PriceRegistryOwnershipTransferred
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryOwnershipTransferred, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryOwnershipTransferred); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryOwnershipTransferred)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseOwnershipTransferred_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseOwnershipTransferred'
-type PriceRegistryInterface_ParseOwnershipTransferred_Call struct {
-	*mock.Call
-}
-
-// ParseOwnershipTransferred is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseOwnershipTransferred(log interface{}) *PriceRegistryInterface_ParseOwnershipTransferred_Call {
-	return &PriceRegistryInterface_ParseOwnershipTransferred_Call{Call: _e.mock.On("ParseOwnershipTransferred", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseOwnershipTransferred_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseOwnershipTransferred_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseOwnershipTransferred_Call) Return(_a0 *price_registry.PriceRegistryOwnershipTransferred, _a1 error) *PriceRegistryInterface_ParseOwnershipTransferred_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseOwnershipTransferred_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryOwnershipTransferred, error)) *PriceRegistryInterface_ParseOwnershipTransferred_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParsePremiumMultiplierWeiPerEthUpdated provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParsePremiumMultiplierWeiPerEthUpdated(log types.Log) (*price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParsePremiumMultiplierWeiPerEthUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParsePremiumMultiplierWeiPerEthUpdated'
-type PriceRegistryInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call struct {
-	*mock.Call
-}
-
-// ParsePremiumMultiplierWeiPerEthUpdated is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParsePremiumMultiplierWeiPerEthUpdated(log interface{}) *PriceRegistryInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call {
-	return &PriceRegistryInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call{Call: _e.mock.On("ParsePremiumMultiplierWeiPerEthUpdated", log)}
-}
-
-func (_c *PriceRegistryInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call) Return(_a0 *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated, _a1 error) *PriceRegistryInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated, error)) *PriceRegistryInterface_ParsePremiumMultiplierWeiPerEthUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParsePriceFeedPerTokenUpdated provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParsePriceFeedPerTokenUpdated(log types.Log) (*price_registry.PriceRegistryPriceFeedPerTokenUpdated, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParsePriceFeedPerTokenUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryPriceFeedPerTokenUpdated
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryPriceFeedPerTokenUpdated, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryPriceFeedPerTokenUpdated); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryPriceFeedPerTokenUpdated)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParsePriceFeedPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParsePriceFeedPerTokenUpdated'
-type PriceRegistryInterface_ParsePriceFeedPerTokenUpdated_Call struct {
-	*mock.Call
-}
-
-// ParsePriceFeedPerTokenUpdated is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParsePriceFeedPerTokenUpdated(log interface{}) *PriceRegistryInterface_ParsePriceFeedPerTokenUpdated_Call {
-	return &PriceRegistryInterface_ParsePriceFeedPerTokenUpdated_Call{Call: _e.mock.On("ParsePriceFeedPerTokenUpdated", log)}
-}
-
-func (_c *PriceRegistryInterface_ParsePriceFeedPerTokenUpdated_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParsePriceFeedPerTokenUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParsePriceFeedPerTokenUpdated_Call) Return(_a0 *price_registry.PriceRegistryPriceFeedPerTokenUpdated, _a1 error) *PriceRegistryInterface_ParsePriceFeedPerTokenUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParsePriceFeedPerTokenUpdated_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryPriceFeedPerTokenUpdated, error)) *PriceRegistryInterface_ParsePriceFeedPerTokenUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseReportPermissionSet provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseReportPermissionSet(log types.Log) (*price_registry.PriceRegistryReportPermissionSet, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseReportPermissionSet")
-	}
-
-	var r0 *price_registry.PriceRegistryReportPermissionSet
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryReportPermissionSet, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryReportPermissionSet); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryReportPermissionSet)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseReportPermissionSet_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseReportPermissionSet'
-type PriceRegistryInterface_ParseReportPermissionSet_Call struct {
-	*mock.Call
-}
-
-// ParseReportPermissionSet is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseReportPermissionSet(log interface{}) *PriceRegistryInterface_ParseReportPermissionSet_Call {
-	return &PriceRegistryInterface_ParseReportPermissionSet_Call{Call: _e.mock.On("ParseReportPermissionSet", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseReportPermissionSet_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseReportPermissionSet_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseReportPermissionSet_Call) Return(_a0 *price_registry.PriceRegistryReportPermissionSet, _a1 error) *PriceRegistryInterface_ParseReportPermissionSet_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseReportPermissionSet_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryReportPermissionSet, error)) *PriceRegistryInterface_ParseReportPermissionSet_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseTokenTransferFeeConfigDeleted provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseTokenTransferFeeConfigDeleted(log types.Log) (*price_registry.PriceRegistryTokenTransferFeeConfigDeleted, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseTokenTransferFeeConfigDeleted")
-	}
-
-	var r0 *price_registry.PriceRegistryTokenTransferFeeConfigDeleted
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryTokenTransferFeeConfigDeleted, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryTokenTransferFeeConfigDeleted); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryTokenTransferFeeConfigDeleted)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseTokenTransferFeeConfigDeleted_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseTokenTransferFeeConfigDeleted'
-type PriceRegistryInterface_ParseTokenTransferFeeConfigDeleted_Call struct {
-	*mock.Call
-}
-
-// ParseTokenTransferFeeConfigDeleted is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseTokenTransferFeeConfigDeleted(log interface{}) *PriceRegistryInterface_ParseTokenTransferFeeConfigDeleted_Call {
-	return &PriceRegistryInterface_ParseTokenTransferFeeConfigDeleted_Call{Call: _e.mock.On("ParseTokenTransferFeeConfigDeleted", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseTokenTransferFeeConfigDeleted_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseTokenTransferFeeConfigDeleted_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseTokenTransferFeeConfigDeleted_Call) Return(_a0 *price_registry.PriceRegistryTokenTransferFeeConfigDeleted, _a1 error) *PriceRegistryInterface_ParseTokenTransferFeeConfigDeleted_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseTokenTransferFeeConfigDeleted_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryTokenTransferFeeConfigDeleted, error)) *PriceRegistryInterface_ParseTokenTransferFeeConfigDeleted_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseTokenTransferFeeConfigUpdated provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseTokenTransferFeeConfigUpdated(log types.Log) (*price_registry.PriceRegistryTokenTransferFeeConfigUpdated, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseTokenTransferFeeConfigUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryTokenTransferFeeConfigUpdated
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryTokenTransferFeeConfigUpdated, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryTokenTransferFeeConfigUpdated); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryTokenTransferFeeConfigUpdated)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseTokenTransferFeeConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseTokenTransferFeeConfigUpdated'
-type PriceRegistryInterface_ParseTokenTransferFeeConfigUpdated_Call struct {
-	*mock.Call
-}
-
-// ParseTokenTransferFeeConfigUpdated is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseTokenTransferFeeConfigUpdated(log interface{}) *PriceRegistryInterface_ParseTokenTransferFeeConfigUpdated_Call {
-	return &PriceRegistryInterface_ParseTokenTransferFeeConfigUpdated_Call{Call: _e.mock.On("ParseTokenTransferFeeConfigUpdated", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseTokenTransferFeeConfigUpdated_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseTokenTransferFeeConfigUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseTokenTransferFeeConfigUpdated_Call) Return(_a0 *price_registry.PriceRegistryTokenTransferFeeConfigUpdated, _a1 error) *PriceRegistryInterface_ParseTokenTransferFeeConfigUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseTokenTransferFeeConfigUpdated_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryTokenTransferFeeConfigUpdated, error)) *PriceRegistryInterface_ParseTokenTransferFeeConfigUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseUsdPerTokenUpdated provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseUsdPerTokenUpdated(log types.Log) (*price_registry.PriceRegistryUsdPerTokenUpdated, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseUsdPerTokenUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryUsdPerTokenUpdated
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryUsdPerTokenUpdated, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryUsdPerTokenUpdated); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryUsdPerTokenUpdated)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseUsdPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseUsdPerTokenUpdated'
-type PriceRegistryInterface_ParseUsdPerTokenUpdated_Call struct {
-	*mock.Call
-}
-
-// ParseUsdPerTokenUpdated is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseUsdPerTokenUpdated(log interface{}) *PriceRegistryInterface_ParseUsdPerTokenUpdated_Call {
-	return &PriceRegistryInterface_ParseUsdPerTokenUpdated_Call{Call: _e.mock.On("ParseUsdPerTokenUpdated", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseUsdPerTokenUpdated_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseUsdPerTokenUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseUsdPerTokenUpdated_Call) Return(_a0 *price_registry.PriceRegistryUsdPerTokenUpdated, _a1 error) *PriceRegistryInterface_ParseUsdPerTokenUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseUsdPerTokenUpdated_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryUsdPerTokenUpdated, error)) *PriceRegistryInterface_ParseUsdPerTokenUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ParseUsdPerUnitGasUpdated provides a mock function with given fields: log
-func (_m *PriceRegistryInterface) ParseUsdPerUnitGasUpdated(log types.Log) (*price_registry.PriceRegistryUsdPerUnitGasUpdated, error) {
-	ret := _m.Called(log)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ParseUsdPerUnitGasUpdated")
-	}
-
-	var r0 *price_registry.PriceRegistryUsdPerUnitGasUpdated
-	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Log) (*price_registry.PriceRegistryUsdPerUnitGasUpdated, error)); ok {
-		return rf(log)
-	}
-	if rf, ok := ret.Get(0).(func(types.Log) *price_registry.PriceRegistryUsdPerUnitGasUpdated); ok {
-		r0 = rf(log)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*price_registry.PriceRegistryUsdPerUnitGasUpdated)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(types.Log) error); ok {
-		r1 = rf(log)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ParseUsdPerUnitGasUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ParseUsdPerUnitGasUpdated'
-type PriceRegistryInterface_ParseUsdPerUnitGasUpdated_Call struct {
-	*mock.Call
-}
-
-// ParseUsdPerUnitGasUpdated is a helper method to define mock.On call
-//   - log types.Log
-func (_e *PriceRegistryInterface_Expecter) ParseUsdPerUnitGasUpdated(log interface{}) *PriceRegistryInterface_ParseUsdPerUnitGasUpdated_Call {
-	return &PriceRegistryInterface_ParseUsdPerUnitGasUpdated_Call{Call: _e.mock.On("ParseUsdPerUnitGasUpdated", log)}
-}
-
-func (_c *PriceRegistryInterface_ParseUsdPerUnitGasUpdated_Call) Run(run func(log types.Log)) *PriceRegistryInterface_ParseUsdPerUnitGasUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(types.Log))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseUsdPerUnitGasUpdated_Call) Return(_a0 *price_registry.PriceRegistryUsdPerUnitGasUpdated, _a1 error) *PriceRegistryInterface_ParseUsdPerUnitGasUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ParseUsdPerUnitGasUpdated_Call) RunAndReturn(run func(types.Log) (*price_registry.PriceRegistryUsdPerUnitGasUpdated, error)) *PriceRegistryInterface_ParseUsdPerUnitGasUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ProcessMessageArgs provides a mock function with given fields: opts, destChainSelector, feeToken, feeTokenAmount, extraArgs
-func (_m *PriceRegistryInterface) ProcessMessageArgs(opts *bind.CallOpts, destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte) (price_registry.ProcessMessageArgs, error) {
-	ret := _m.Called(opts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ProcessMessageArgs")
-	}
-
-	var r0 price_registry.ProcessMessageArgs
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, common.Address, *big.Int, []byte) (price_registry.ProcessMessageArgs, error)); ok {
-		return rf(opts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, common.Address, *big.Int, []byte) price_registry.ProcessMessageArgs); ok {
-		r0 = rf(opts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
-	} else {
-		r0 = ret.Get(0).(price_registry.ProcessMessageArgs)
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts, uint64, common.Address, *big.Int, []byte) error); ok {
-		r1 = rf(opts, destChainSelector, feeToken, feeTokenAmount, extraArgs)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_ProcessMessageArgs_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ProcessMessageArgs'
-type PriceRegistryInterface_ProcessMessageArgs_Call struct {
-	*mock.Call
-}
-
-// ProcessMessageArgs is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - destChainSelector uint64
-//   - feeToken common.Address
-//   - feeTokenAmount *big.Int
-//   - extraArgs []byte
-func (_e *PriceRegistryInterface_Expecter) ProcessMessageArgs(opts interface{}, destChainSelector interface{}, feeToken interface{}, feeTokenAmount interface{}, extraArgs interface{}) *PriceRegistryInterface_ProcessMessageArgs_Call {
-	return &PriceRegistryInterface_ProcessMessageArgs_Call{Call: _e.mock.On("ProcessMessageArgs", opts, destChainSelector, feeToken, feeTokenAmount, extraArgs)}
-}
-
-func (_c *PriceRegistryInterface_ProcessMessageArgs_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64, feeToken common.Address, feeTokenAmount *big.Int, extraArgs []byte)) *PriceRegistryInterface_ProcessMessageArgs_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(uint64), args[2].(common.Address), args[3].(*big.Int), args[4].([]byte))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ProcessMessageArgs_Call) Return(_a0 price_registry.ProcessMessageArgs, _a1 error) *PriceRegistryInterface_ProcessMessageArgs_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ProcessMessageArgs_Call) RunAndReturn(run func(*bind.CallOpts, uint64, common.Address, *big.Int, []byte) (price_registry.ProcessMessageArgs, error)) *PriceRegistryInterface_ProcessMessageArgs_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// SetReportPermissions provides a mock function with given fields: opts, permissions
-func (_m *PriceRegistryInterface) SetReportPermissions(opts *bind.TransactOpts, permissions []price_registry.KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error) {
-	ret := _m.Called(opts, permissions)
-
-	if len(ret) == 0 {
-		panic("no return value specified for SetReportPermissions")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []price_registry.KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error)); ok {
-		return rf(opts, permissions)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []price_registry.KeystoneFeedsPermissionHandlerPermission) *types.Transaction); ok {
-		r0 = rf(opts, permissions)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []price_registry.KeystoneFeedsPermissionHandlerPermission) error); ok {
-		r1 = rf(opts, permissions)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_SetReportPermissions_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetReportPermissions'
-type PriceRegistryInterface_SetReportPermissions_Call struct {
-	*mock.Call
-}
-
-// SetReportPermissions is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-//   - permissions []price_registry.KeystoneFeedsPermissionHandlerPermission
-func (_e *PriceRegistryInterface_Expecter) SetReportPermissions(opts interface{}, permissions interface{}) *PriceRegistryInterface_SetReportPermissions_Call {
-	return &PriceRegistryInterface_SetReportPermissions_Call{Call: _e.mock.On("SetReportPermissions", opts, permissions)}
-}
-
-func (_c *PriceRegistryInterface_SetReportPermissions_Call) Run(run func(opts *bind.TransactOpts, permissions []price_registry.KeystoneFeedsPermissionHandlerPermission)) *PriceRegistryInterface_SetReportPermissions_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts), args[1].([]price_registry.KeystoneFeedsPermissionHandlerPermission))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_SetReportPermissions_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_SetReportPermissions_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_SetReportPermissions_Call) RunAndReturn(run func(*bind.TransactOpts, []price_registry.KeystoneFeedsPermissionHandlerPermission) (*types.Transaction, error)) *PriceRegistryInterface_SetReportPermissions_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// TransferOwnership provides a mock function with given fields: opts, to
-func (_m *PriceRegistryInterface) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
-	ret := _m.Called(opts, to)
-
-	if len(ret) == 0 {
-		panic("no return value specified for TransferOwnership")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
-		return rf(opts, to)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) *types.Transaction); ok {
-		r0 = rf(opts, to)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, common.Address) error); ok {
-		r1 = rf(opts, to)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_TransferOwnership_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'TransferOwnership'
-type PriceRegistryInterface_TransferOwnership_Call struct {
-	*mock.Call
-}
-
-// TransferOwnership is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-//   - to common.Address
-func (_e *PriceRegistryInterface_Expecter) TransferOwnership(opts interface{}, to interface{}) *PriceRegistryInterface_TransferOwnership_Call {
-	return &PriceRegistryInterface_TransferOwnership_Call{Call: _e.mock.On("TransferOwnership", opts, to)}
-}
-
-func (_c *PriceRegistryInterface_TransferOwnership_Call) Run(run func(opts *bind.TransactOpts, to common.Address)) *PriceRegistryInterface_TransferOwnership_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts), args[1].(common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_TransferOwnership_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_TransferOwnership_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_TransferOwnership_Call) RunAndReturn(run func(*bind.TransactOpts, common.Address) (*types.Transaction, error)) *PriceRegistryInterface_TransferOwnership_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// TypeAndVersion provides a mock function with given fields: opts
-func (_m *PriceRegistryInterface) TypeAndVersion(opts *bind.CallOpts) (string, error) {
-	ret := _m.Called(opts)
-
-	if len(ret) == 0 {
-		panic("no return value specified for TypeAndVersion")
-	}
-
-	var r0 string
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (string, error)); ok {
-		return rf(opts)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts) string); ok {
-		r0 = rf(opts)
-	} else {
-		r0 = ret.Get(0).(string)
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.CallOpts) error); ok {
-		r1 = rf(opts)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_TypeAndVersion_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'TypeAndVersion'
-type PriceRegistryInterface_TypeAndVersion_Call struct {
-	*mock.Call
-}
-
-// TypeAndVersion is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-func (_e *PriceRegistryInterface_Expecter) TypeAndVersion(opts interface{}) *PriceRegistryInterface_TypeAndVersion_Call {
-	return &PriceRegistryInterface_TypeAndVersion_Call{Call: _e.mock.On("TypeAndVersion", opts)}
-}
-
-func (_c *PriceRegistryInterface_TypeAndVersion_Call) Run(run func(opts *bind.CallOpts)) *PriceRegistryInterface_TypeAndVersion_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_TypeAndVersion_Call) Return(_a0 string, _a1 error) *PriceRegistryInterface_TypeAndVersion_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_TypeAndVersion_Call) RunAndReturn(run func(*bind.CallOpts) (string, error)) *PriceRegistryInterface_TypeAndVersion_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// UpdatePrices provides a mock function with given fields: opts, priceUpdates
-func (_m *PriceRegistryInterface) UpdatePrices(opts *bind.TransactOpts, priceUpdates price_registry.InternalPriceUpdates) (*types.Transaction, error) {
-	ret := _m.Called(opts, priceUpdates)
-
-	if len(ret) == 0 {
-		panic("no return value specified for UpdatePrices")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, price_registry.InternalPriceUpdates) (*types.Transaction, error)); ok {
-		return rf(opts, priceUpdates)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, price_registry.InternalPriceUpdates) *types.Transaction); ok {
-		r0 = rf(opts, priceUpdates)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, price_registry.InternalPriceUpdates) error); ok {
-		r1 = rf(opts, priceUpdates)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_UpdatePrices_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdatePrices'
-type PriceRegistryInterface_UpdatePrices_Call struct {
-	*mock.Call
-}
-
-// UpdatePrices is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-//   - priceUpdates price_registry.InternalPriceUpdates
-func (_e *PriceRegistryInterface_Expecter) UpdatePrices(opts interface{}, priceUpdates interface{}) *PriceRegistryInterface_UpdatePrices_Call {
-	return &PriceRegistryInterface_UpdatePrices_Call{Call: _e.mock.On("UpdatePrices", opts, priceUpdates)}
-}
-
-func (_c *PriceRegistryInterface_UpdatePrices_Call) Run(run func(opts *bind.TransactOpts, priceUpdates price_registry.InternalPriceUpdates)) *PriceRegistryInterface_UpdatePrices_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts), args[1].(price_registry.InternalPriceUpdates))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_UpdatePrices_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_UpdatePrices_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_UpdatePrices_Call) RunAndReturn(run func(*bind.TransactOpts, price_registry.InternalPriceUpdates) (*types.Transaction, error)) *PriceRegistryInterface_UpdatePrices_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// UpdateTokenPriceFeeds provides a mock function with given fields: opts, tokenPriceFeedUpdates
-func (_m *PriceRegistryInterface) UpdateTokenPriceFeeds(opts *bind.TransactOpts, tokenPriceFeedUpdates []price_registry.PriceRegistryTokenPriceFeedUpdate) (*types.Transaction, error) {
-	ret := _m.Called(opts, tokenPriceFeedUpdates)
-
-	if len(ret) == 0 {
-		panic("no return value specified for UpdateTokenPriceFeeds")
-	}
-
-	var r0 *types.Transaction
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []price_registry.PriceRegistryTokenPriceFeedUpdate) (*types.Transaction, error)); ok {
-		return rf(opts, tokenPriceFeedUpdates)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []price_registry.PriceRegistryTokenPriceFeedUpdate) *types.Transaction); ok {
-		r0 = rf(opts, tokenPriceFeedUpdates)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.Transaction)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, []price_registry.PriceRegistryTokenPriceFeedUpdate) error); ok {
-		r1 = rf(opts, tokenPriceFeedUpdates)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_UpdateTokenPriceFeeds_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpdateTokenPriceFeeds'
-type PriceRegistryInterface_UpdateTokenPriceFeeds_Call struct {
-	*mock.Call
-}
-
-// UpdateTokenPriceFeeds is a helper method to define mock.On call
-//   - opts *bind.TransactOpts
-//   - tokenPriceFeedUpdates []price_registry.PriceRegistryTokenPriceFeedUpdate
-func (_e *PriceRegistryInterface_Expecter) UpdateTokenPriceFeeds(opts interface{}, tokenPriceFeedUpdates interface{}) *PriceRegistryInterface_UpdateTokenPriceFeeds_Call {
-	return &PriceRegistryInterface_UpdateTokenPriceFeeds_Call{Call: _e.mock.On("UpdateTokenPriceFeeds", opts, tokenPriceFeedUpdates)}
-}
-
-func (_c *PriceRegistryInterface_UpdateTokenPriceFeeds_Call) Run(run func(opts *bind.TransactOpts, tokenPriceFeedUpdates []price_registry.PriceRegistryTokenPriceFeedUpdate)) *PriceRegistryInterface_UpdateTokenPriceFeeds_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.TransactOpts), args[1].([]price_registry.PriceRegistryTokenPriceFeedUpdate))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_UpdateTokenPriceFeeds_Call) Return(_a0 *types.Transaction, _a1 error) *PriceRegistryInterface_UpdateTokenPriceFeeds_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_UpdateTokenPriceFeeds_Call) RunAndReturn(run func(*bind.TransactOpts, []price_registry.PriceRegistryTokenPriceFeedUpdate) (*types.Transaction, error)) *PriceRegistryInterface_UpdateTokenPriceFeeds_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ValidatePoolReturnData provides a mock function with given fields: opts, destChainSelector, rampTokenAmounts, sourceTokenAmounts
-func (_m *PriceRegistryInterface) ValidatePoolReturnData(opts *bind.CallOpts, destChainSelector uint64, rampTokenAmounts []price_registry.InternalRampTokenAmount, sourceTokenAmounts []price_registry.ClientEVMTokenAmount) error {
-	ret := _m.Called(opts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ValidatePoolReturnData")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64, []price_registry.InternalRampTokenAmount, []price_registry.ClientEVMTokenAmount) error); ok {
-		r0 = rf(opts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// PriceRegistryInterface_ValidatePoolReturnData_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ValidatePoolReturnData'
-type PriceRegistryInterface_ValidatePoolReturnData_Call struct {
-	*mock.Call
-}
-
-// ValidatePoolReturnData is a helper method to define mock.On call
-//   - opts *bind.CallOpts
-//   - destChainSelector uint64
-//   - rampTokenAmounts []price_registry.InternalRampTokenAmount
-//   - sourceTokenAmounts []price_registry.ClientEVMTokenAmount
-func (_e *PriceRegistryInterface_Expecter) ValidatePoolReturnData(opts interface{}, destChainSelector interface{}, rampTokenAmounts interface{}, sourceTokenAmounts interface{}) *PriceRegistryInterface_ValidatePoolReturnData_Call {
-	return &PriceRegistryInterface_ValidatePoolReturnData_Call{Call: _e.mock.On("ValidatePoolReturnData", opts, destChainSelector, rampTokenAmounts, sourceTokenAmounts)}
-}
-
-func (_c *PriceRegistryInterface_ValidatePoolReturnData_Call) Run(run func(opts *bind.CallOpts, destChainSelector uint64, rampTokenAmounts []price_registry.InternalRampTokenAmount, sourceTokenAmounts []price_registry.ClientEVMTokenAmount)) *PriceRegistryInterface_ValidatePoolReturnData_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.CallOpts), args[1].(uint64), args[2].([]price_registry.InternalRampTokenAmount), args[3].([]price_registry.ClientEVMTokenAmount))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ValidatePoolReturnData_Call) Return(_a0 error) *PriceRegistryInterface_ValidatePoolReturnData_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_ValidatePoolReturnData_Call) RunAndReturn(run func(*bind.CallOpts, uint64, []price_registry.InternalRampTokenAmount, []price_registry.ClientEVMTokenAmount) error) *PriceRegistryInterface_ValidatePoolReturnData_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchAuthorizedCallerAdded provides a mock function with given fields: opts, sink
-func (_m *PriceRegistryInterface) WatchAuthorizedCallerAdded(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryAuthorizedCallerAdded) (event.Subscription, error) {
-	ret := _m.Called(opts, sink)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchAuthorizedCallerAdded")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryAuthorizedCallerAdded) (event.Subscription, error)); ok {
-		return rf(opts, sink)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryAuthorizedCallerAdded) event.Subscription); ok {
-		r0 = rf(opts, sink)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryAuthorizedCallerAdded) error); ok {
-		r1 = rf(opts, sink)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchAuthorizedCallerAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchAuthorizedCallerAdded'
-type PriceRegistryInterface_WatchAuthorizedCallerAdded_Call struct {
-	*mock.Call
-}
-
-// WatchAuthorizedCallerAdded is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryAuthorizedCallerAdded
-func (_e *PriceRegistryInterface_Expecter) WatchAuthorizedCallerAdded(opts interface{}, sink interface{}) *PriceRegistryInterface_WatchAuthorizedCallerAdded_Call {
-	return &PriceRegistryInterface_WatchAuthorizedCallerAdded_Call{Call: _e.mock.On("WatchAuthorizedCallerAdded", opts, sink)}
-}
-
-func (_c *PriceRegistryInterface_WatchAuthorizedCallerAdded_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryAuthorizedCallerAdded)) *PriceRegistryInterface_WatchAuthorizedCallerAdded_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryAuthorizedCallerAdded))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchAuthorizedCallerAdded_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchAuthorizedCallerAdded_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchAuthorizedCallerAdded_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryAuthorizedCallerAdded) (event.Subscription, error)) *PriceRegistryInterface_WatchAuthorizedCallerAdded_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchAuthorizedCallerRemoved provides a mock function with given fields: opts, sink
-func (_m *PriceRegistryInterface) WatchAuthorizedCallerRemoved(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryAuthorizedCallerRemoved) (event.Subscription, error) {
-	ret := _m.Called(opts, sink)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchAuthorizedCallerRemoved")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryAuthorizedCallerRemoved) (event.Subscription, error)); ok {
-		return rf(opts, sink)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryAuthorizedCallerRemoved) event.Subscription); ok {
-		r0 = rf(opts, sink)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryAuthorizedCallerRemoved) error); ok {
-		r1 = rf(opts, sink)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchAuthorizedCallerRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchAuthorizedCallerRemoved'
-type PriceRegistryInterface_WatchAuthorizedCallerRemoved_Call struct {
-	*mock.Call
-}
-
-// WatchAuthorizedCallerRemoved is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryAuthorizedCallerRemoved
-func (_e *PriceRegistryInterface_Expecter) WatchAuthorizedCallerRemoved(opts interface{}, sink interface{}) *PriceRegistryInterface_WatchAuthorizedCallerRemoved_Call {
-	return &PriceRegistryInterface_WatchAuthorizedCallerRemoved_Call{Call: _e.mock.On("WatchAuthorizedCallerRemoved", opts, sink)}
-}
-
-func (_c *PriceRegistryInterface_WatchAuthorizedCallerRemoved_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryAuthorizedCallerRemoved)) *PriceRegistryInterface_WatchAuthorizedCallerRemoved_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryAuthorizedCallerRemoved))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchAuthorizedCallerRemoved_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchAuthorizedCallerRemoved_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchAuthorizedCallerRemoved_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryAuthorizedCallerRemoved) (event.Subscription, error)) *PriceRegistryInterface_WatchAuthorizedCallerRemoved_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchDestChainAdded provides a mock function with given fields: opts, sink, destChainSelector
-func (_m *PriceRegistryInterface) WatchDestChainAdded(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryDestChainAdded, destChainSelector []uint64) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, destChainSelector)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchDestChainAdded")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryDestChainAdded, []uint64) (event.Subscription, error)); ok {
-		return rf(opts, sink, destChainSelector)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryDestChainAdded, []uint64) event.Subscription); ok {
-		r0 = rf(opts, sink, destChainSelector)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryDestChainAdded, []uint64) error); ok {
-		r1 = rf(opts, sink, destChainSelector)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchDestChainAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchDestChainAdded'
-type PriceRegistryInterface_WatchDestChainAdded_Call struct {
-	*mock.Call
-}
-
-// WatchDestChainAdded is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryDestChainAdded
-//   - destChainSelector []uint64
-func (_e *PriceRegistryInterface_Expecter) WatchDestChainAdded(opts interface{}, sink interface{}, destChainSelector interface{}) *PriceRegistryInterface_WatchDestChainAdded_Call {
-	return &PriceRegistryInterface_WatchDestChainAdded_Call{Call: _e.mock.On("WatchDestChainAdded", opts, sink, destChainSelector)}
-}
-
-func (_c *PriceRegistryInterface_WatchDestChainAdded_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryDestChainAdded, destChainSelector []uint64)) *PriceRegistryInterface_WatchDestChainAdded_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryDestChainAdded), args[2].([]uint64))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchDestChainAdded_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchDestChainAdded_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchDestChainAdded_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryDestChainAdded, []uint64) (event.Subscription, error)) *PriceRegistryInterface_WatchDestChainAdded_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchDestChainConfigUpdated provides a mock function with given fields: opts, sink, destChainSelector
-func (_m *PriceRegistryInterface) WatchDestChainConfigUpdated(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryDestChainConfigUpdated, destChainSelector []uint64) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, destChainSelector)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchDestChainConfigUpdated")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryDestChainConfigUpdated, []uint64) (event.Subscription, error)); ok {
-		return rf(opts, sink, destChainSelector)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryDestChainConfigUpdated, []uint64) event.Subscription); ok {
-		r0 = rf(opts, sink, destChainSelector)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryDestChainConfigUpdated, []uint64) error); ok {
-		r1 = rf(opts, sink, destChainSelector)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchDestChainConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchDestChainConfigUpdated'
-type PriceRegistryInterface_WatchDestChainConfigUpdated_Call struct {
-	*mock.Call
-}
-
-// WatchDestChainConfigUpdated is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryDestChainConfigUpdated
-//   - destChainSelector []uint64
-func (_e *PriceRegistryInterface_Expecter) WatchDestChainConfigUpdated(opts interface{}, sink interface{}, destChainSelector interface{}) *PriceRegistryInterface_WatchDestChainConfigUpdated_Call {
-	return &PriceRegistryInterface_WatchDestChainConfigUpdated_Call{Call: _e.mock.On("WatchDestChainConfigUpdated", opts, sink, destChainSelector)}
-}
-
-func (_c *PriceRegistryInterface_WatchDestChainConfigUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryDestChainConfigUpdated, destChainSelector []uint64)) *PriceRegistryInterface_WatchDestChainConfigUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryDestChainConfigUpdated), args[2].([]uint64))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchDestChainConfigUpdated_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchDestChainConfigUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchDestChainConfigUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryDestChainConfigUpdated, []uint64) (event.Subscription, error)) *PriceRegistryInterface_WatchDestChainConfigUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchFeeTokenAdded provides a mock function with given fields: opts, sink, feeToken
-func (_m *PriceRegistryInterface) WatchFeeTokenAdded(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryFeeTokenAdded, feeToken []common.Address) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, feeToken)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchFeeTokenAdded")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryFeeTokenAdded, []common.Address) (event.Subscription, error)); ok {
-		return rf(opts, sink, feeToken)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryFeeTokenAdded, []common.Address) event.Subscription); ok {
-		r0 = rf(opts, sink, feeToken)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryFeeTokenAdded, []common.Address) error); ok {
-		r1 = rf(opts, sink, feeToken)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchFeeTokenAdded_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchFeeTokenAdded'
-type PriceRegistryInterface_WatchFeeTokenAdded_Call struct {
-	*mock.Call
-}
-
-// WatchFeeTokenAdded is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryFeeTokenAdded
-//   - feeToken []common.Address
-func (_e *PriceRegistryInterface_Expecter) WatchFeeTokenAdded(opts interface{}, sink interface{}, feeToken interface{}) *PriceRegistryInterface_WatchFeeTokenAdded_Call {
-	return &PriceRegistryInterface_WatchFeeTokenAdded_Call{Call: _e.mock.On("WatchFeeTokenAdded", opts, sink, feeToken)}
-}
-
-func (_c *PriceRegistryInterface_WatchFeeTokenAdded_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryFeeTokenAdded, feeToken []common.Address)) *PriceRegistryInterface_WatchFeeTokenAdded_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryFeeTokenAdded), args[2].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchFeeTokenAdded_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchFeeTokenAdded_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchFeeTokenAdded_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryFeeTokenAdded, []common.Address) (event.Subscription, error)) *PriceRegistryInterface_WatchFeeTokenAdded_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchFeeTokenRemoved provides a mock function with given fields: opts, sink, feeToken
-func (_m *PriceRegistryInterface) WatchFeeTokenRemoved(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryFeeTokenRemoved, feeToken []common.Address) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, feeToken)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchFeeTokenRemoved")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryFeeTokenRemoved, []common.Address) (event.Subscription, error)); ok {
-		return rf(opts, sink, feeToken)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryFeeTokenRemoved, []common.Address) event.Subscription); ok {
-		r0 = rf(opts, sink, feeToken)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryFeeTokenRemoved, []common.Address) error); ok {
-		r1 = rf(opts, sink, feeToken)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchFeeTokenRemoved_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchFeeTokenRemoved'
-type PriceRegistryInterface_WatchFeeTokenRemoved_Call struct {
-	*mock.Call
-}
-
-// WatchFeeTokenRemoved is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryFeeTokenRemoved
-//   - feeToken []common.Address
-func (_e *PriceRegistryInterface_Expecter) WatchFeeTokenRemoved(opts interface{}, sink interface{}, feeToken interface{}) *PriceRegistryInterface_WatchFeeTokenRemoved_Call {
-	return &PriceRegistryInterface_WatchFeeTokenRemoved_Call{Call: _e.mock.On("WatchFeeTokenRemoved", opts, sink, feeToken)}
-}
-
-func (_c *PriceRegistryInterface_WatchFeeTokenRemoved_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryFeeTokenRemoved, feeToken []common.Address)) *PriceRegistryInterface_WatchFeeTokenRemoved_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryFeeTokenRemoved), args[2].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchFeeTokenRemoved_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchFeeTokenRemoved_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchFeeTokenRemoved_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryFeeTokenRemoved, []common.Address) (event.Subscription, error)) *PriceRegistryInterface_WatchFeeTokenRemoved_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchOwnershipTransferRequested provides a mock function with given fields: opts, sink, from, to
-func (_m *PriceRegistryInterface) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, from, to)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchOwnershipTransferRequested")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
-		return rf(opts, sink, from, to)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryOwnershipTransferRequested, []common.Address, []common.Address) event.Subscription); ok {
-		r0 = rf(opts, sink, from, to)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryOwnershipTransferRequested, []common.Address, []common.Address) error); ok {
-		r1 = rf(opts, sink, from, to)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchOwnershipTransferRequested_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchOwnershipTransferRequested'
-type PriceRegistryInterface_WatchOwnershipTransferRequested_Call struct {
-	*mock.Call
-}
-
-// WatchOwnershipTransferRequested is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryOwnershipTransferRequested
-//   - from []common.Address
-//   - to []common.Address
-func (_e *PriceRegistryInterface_Expecter) WatchOwnershipTransferRequested(opts interface{}, sink interface{}, from interface{}, to interface{}) *PriceRegistryInterface_WatchOwnershipTransferRequested_Call {
-	return &PriceRegistryInterface_WatchOwnershipTransferRequested_Call{Call: _e.mock.On("WatchOwnershipTransferRequested", opts, sink, from, to)}
-}
-
-func (_c *PriceRegistryInterface_WatchOwnershipTransferRequested_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryOwnershipTransferRequested, from []common.Address, to []common.Address)) *PriceRegistryInterface_WatchOwnershipTransferRequested_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryOwnershipTransferRequested), args[2].([]common.Address), args[3].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchOwnershipTransferRequested_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchOwnershipTransferRequested_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchOwnershipTransferRequested_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)) *PriceRegistryInterface_WatchOwnershipTransferRequested_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchOwnershipTransferred provides a mock function with given fields: opts, sink, from, to
-func (_m *PriceRegistryInterface) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, from, to)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchOwnershipTransferred")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
-		return rf(opts, sink, from, to)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryOwnershipTransferred, []common.Address, []common.Address) event.Subscription); ok {
-		r0 = rf(opts, sink, from, to)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryOwnershipTransferred, []common.Address, []common.Address) error); ok {
-		r1 = rf(opts, sink, from, to)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchOwnershipTransferred_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchOwnershipTransferred'
-type PriceRegistryInterface_WatchOwnershipTransferred_Call struct {
-	*mock.Call
-}
-
-// WatchOwnershipTransferred is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryOwnershipTransferred
-//   - from []common.Address
-//   - to []common.Address
-func (_e *PriceRegistryInterface_Expecter) WatchOwnershipTransferred(opts interface{}, sink interface{}, from interface{}, to interface{}) *PriceRegistryInterface_WatchOwnershipTransferred_Call {
-	return &PriceRegistryInterface_WatchOwnershipTransferred_Call{Call: _e.mock.On("WatchOwnershipTransferred", opts, sink, from, to)}
-}
-
-func (_c *PriceRegistryInterface_WatchOwnershipTransferred_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryOwnershipTransferred, from []common.Address, to []common.Address)) *PriceRegistryInterface_WatchOwnershipTransferred_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryOwnershipTransferred), args[2].([]common.Address), args[3].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchOwnershipTransferred_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchOwnershipTransferred_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchOwnershipTransferred_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)) *PriceRegistryInterface_WatchOwnershipTransferred_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchPremiumMultiplierWeiPerEthUpdated provides a mock function with given fields: opts, sink, token
-func (_m *PriceRegistryInterface) WatchPremiumMultiplierWeiPerEthUpdated(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated, token []common.Address) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchPremiumMultiplierWeiPerEthUpdated")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated, []common.Address) (event.Subscription, error)); ok {
-		return rf(opts, sink, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated, []common.Address) event.Subscription); ok {
-		r0 = rf(opts, sink, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated, []common.Address) error); ok {
-		r1 = rf(opts, sink, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchPremiumMultiplierWeiPerEthUpdated'
-type PriceRegistryInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call struct {
-	*mock.Call
-}
-
-// WatchPremiumMultiplierWeiPerEthUpdated is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated
-//   - token []common.Address
-func (_e *PriceRegistryInterface_Expecter) WatchPremiumMultiplierWeiPerEthUpdated(opts interface{}, sink interface{}, token interface{}) *PriceRegistryInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call {
-	return &PriceRegistryInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call{Call: _e.mock.On("WatchPremiumMultiplierWeiPerEthUpdated", opts, sink, token)}
-}
-
-func (_c *PriceRegistryInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated, token []common.Address)) *PriceRegistryInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated), args[2].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryPremiumMultiplierWeiPerEthUpdated, []common.Address) (event.Subscription, error)) *PriceRegistryInterface_WatchPremiumMultiplierWeiPerEthUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchPriceFeedPerTokenUpdated provides a mock function with given fields: opts, sink, token
-func (_m *PriceRegistryInterface) WatchPriceFeedPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryPriceFeedPerTokenUpdated, token []common.Address) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchPriceFeedPerTokenUpdated")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryPriceFeedPerTokenUpdated, []common.Address) (event.Subscription, error)); ok {
-		return rf(opts, sink, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryPriceFeedPerTokenUpdated, []common.Address) event.Subscription); ok {
-		r0 = rf(opts, sink, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryPriceFeedPerTokenUpdated, []common.Address) error); ok {
-		r1 = rf(opts, sink, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchPriceFeedPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchPriceFeedPerTokenUpdated'
-type PriceRegistryInterface_WatchPriceFeedPerTokenUpdated_Call struct {
-	*mock.Call
-}
-
-// WatchPriceFeedPerTokenUpdated is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryPriceFeedPerTokenUpdated
-//   - token []common.Address
-func (_e *PriceRegistryInterface_Expecter) WatchPriceFeedPerTokenUpdated(opts interface{}, sink interface{}, token interface{}) *PriceRegistryInterface_WatchPriceFeedPerTokenUpdated_Call {
-	return &PriceRegistryInterface_WatchPriceFeedPerTokenUpdated_Call{Call: _e.mock.On("WatchPriceFeedPerTokenUpdated", opts, sink, token)}
-}
-
-func (_c *PriceRegistryInterface_WatchPriceFeedPerTokenUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryPriceFeedPerTokenUpdated, token []common.Address)) *PriceRegistryInterface_WatchPriceFeedPerTokenUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryPriceFeedPerTokenUpdated), args[2].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchPriceFeedPerTokenUpdated_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchPriceFeedPerTokenUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchPriceFeedPerTokenUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryPriceFeedPerTokenUpdated, []common.Address) (event.Subscription, error)) *PriceRegistryInterface_WatchPriceFeedPerTokenUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchReportPermissionSet provides a mock function with given fields: opts, sink, reportId
-func (_m *PriceRegistryInterface) WatchReportPermissionSet(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryReportPermissionSet, reportId [][32]byte) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, reportId)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchReportPermissionSet")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryReportPermissionSet, [][32]byte) (event.Subscription, error)); ok {
-		return rf(opts, sink, reportId)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryReportPermissionSet, [][32]byte) event.Subscription); ok {
-		r0 = rf(opts, sink, reportId)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryReportPermissionSet, [][32]byte) error); ok {
-		r1 = rf(opts, sink, reportId)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchReportPermissionSet_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchReportPermissionSet'
-type PriceRegistryInterface_WatchReportPermissionSet_Call struct {
-	*mock.Call
-}
-
-// WatchReportPermissionSet is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryReportPermissionSet
-//   - reportId [][32]byte
-func (_e *PriceRegistryInterface_Expecter) WatchReportPermissionSet(opts interface{}, sink interface{}, reportId interface{}) *PriceRegistryInterface_WatchReportPermissionSet_Call {
-	return &PriceRegistryInterface_WatchReportPermissionSet_Call{Call: _e.mock.On("WatchReportPermissionSet", opts, sink, reportId)}
-}
-
-func (_c *PriceRegistryInterface_WatchReportPermissionSet_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryReportPermissionSet, reportId [][32]byte)) *PriceRegistryInterface_WatchReportPermissionSet_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryReportPermissionSet), args[2].([][32]byte))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchReportPermissionSet_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchReportPermissionSet_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchReportPermissionSet_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryReportPermissionSet, [][32]byte) (event.Subscription, error)) *PriceRegistryInterface_WatchReportPermissionSet_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchTokenTransferFeeConfigDeleted provides a mock function with given fields: opts, sink, destChainSelector, token
-func (_m *PriceRegistryInterface) WatchTokenTransferFeeConfigDeleted(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryTokenTransferFeeConfigDeleted, destChainSelector []uint64, token []common.Address) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, destChainSelector, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchTokenTransferFeeConfigDeleted")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryTokenTransferFeeConfigDeleted, []uint64, []common.Address) (event.Subscription, error)); ok {
-		return rf(opts, sink, destChainSelector, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryTokenTransferFeeConfigDeleted, []uint64, []common.Address) event.Subscription); ok {
-		r0 = rf(opts, sink, destChainSelector, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryTokenTransferFeeConfigDeleted, []uint64, []common.Address) error); ok {
-		r1 = rf(opts, sink, destChainSelector, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchTokenTransferFeeConfigDeleted_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchTokenTransferFeeConfigDeleted'
-type PriceRegistryInterface_WatchTokenTransferFeeConfigDeleted_Call struct {
-	*mock.Call
-}
-
-// WatchTokenTransferFeeConfigDeleted is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryTokenTransferFeeConfigDeleted
-//   - destChainSelector []uint64
-//   - token []common.Address
-func (_e *PriceRegistryInterface_Expecter) WatchTokenTransferFeeConfigDeleted(opts interface{}, sink interface{}, destChainSelector interface{}, token interface{}) *PriceRegistryInterface_WatchTokenTransferFeeConfigDeleted_Call {
-	return &PriceRegistryInterface_WatchTokenTransferFeeConfigDeleted_Call{Call: _e.mock.On("WatchTokenTransferFeeConfigDeleted", opts, sink, destChainSelector, token)}
-}
-
-func (_c *PriceRegistryInterface_WatchTokenTransferFeeConfigDeleted_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryTokenTransferFeeConfigDeleted, destChainSelector []uint64, token []common.Address)) *PriceRegistryInterface_WatchTokenTransferFeeConfigDeleted_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryTokenTransferFeeConfigDeleted), args[2].([]uint64), args[3].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchTokenTransferFeeConfigDeleted_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchTokenTransferFeeConfigDeleted_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchTokenTransferFeeConfigDeleted_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryTokenTransferFeeConfigDeleted, []uint64, []common.Address) (event.Subscription, error)) *PriceRegistryInterface_WatchTokenTransferFeeConfigDeleted_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchTokenTransferFeeConfigUpdated provides a mock function with given fields: opts, sink, destChainSelector, token
-func (_m *PriceRegistryInterface) WatchTokenTransferFeeConfigUpdated(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryTokenTransferFeeConfigUpdated, destChainSelector []uint64, token []common.Address) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, destChainSelector, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchTokenTransferFeeConfigUpdated")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryTokenTransferFeeConfigUpdated, []uint64, []common.Address) (event.Subscription, error)); ok {
-		return rf(opts, sink, destChainSelector, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryTokenTransferFeeConfigUpdated, []uint64, []common.Address) event.Subscription); ok {
-		r0 = rf(opts, sink, destChainSelector, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryTokenTransferFeeConfigUpdated, []uint64, []common.Address) error); ok {
-		r1 = rf(opts, sink, destChainSelector, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchTokenTransferFeeConfigUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchTokenTransferFeeConfigUpdated'
-type PriceRegistryInterface_WatchTokenTransferFeeConfigUpdated_Call struct {
-	*mock.Call
-}
-
-// WatchTokenTransferFeeConfigUpdated is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryTokenTransferFeeConfigUpdated
-//   - destChainSelector []uint64
-//   - token []common.Address
-func (_e *PriceRegistryInterface_Expecter) WatchTokenTransferFeeConfigUpdated(opts interface{}, sink interface{}, destChainSelector interface{}, token interface{}) *PriceRegistryInterface_WatchTokenTransferFeeConfigUpdated_Call {
-	return &PriceRegistryInterface_WatchTokenTransferFeeConfigUpdated_Call{Call: _e.mock.On("WatchTokenTransferFeeConfigUpdated", opts, sink, destChainSelector, token)}
-}
-
-func (_c *PriceRegistryInterface_WatchTokenTransferFeeConfigUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryTokenTransferFeeConfigUpdated, destChainSelector []uint64, token []common.Address)) *PriceRegistryInterface_WatchTokenTransferFeeConfigUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryTokenTransferFeeConfigUpdated), args[2].([]uint64), args[3].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchTokenTransferFeeConfigUpdated_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchTokenTransferFeeConfigUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchTokenTransferFeeConfigUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryTokenTransferFeeConfigUpdated, []uint64, []common.Address) (event.Subscription, error)) *PriceRegistryInterface_WatchTokenTransferFeeConfigUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchUsdPerTokenUpdated provides a mock function with given fields: opts, sink, token
-func (_m *PriceRegistryInterface) WatchUsdPerTokenUpdated(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryUsdPerTokenUpdated, token []common.Address) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchUsdPerTokenUpdated")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryUsdPerTokenUpdated, []common.Address) (event.Subscription, error)); ok {
-		return rf(opts, sink, token)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryUsdPerTokenUpdated, []common.Address) event.Subscription); ok {
-		r0 = rf(opts, sink, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryUsdPerTokenUpdated, []common.Address) error); ok {
-		r1 = rf(opts, sink, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchUsdPerTokenUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchUsdPerTokenUpdated'
-type PriceRegistryInterface_WatchUsdPerTokenUpdated_Call struct {
-	*mock.Call
-}
-
-// WatchUsdPerTokenUpdated is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryUsdPerTokenUpdated
-//   - token []common.Address
-func (_e *PriceRegistryInterface_Expecter) WatchUsdPerTokenUpdated(opts interface{}, sink interface{}, token interface{}) *PriceRegistryInterface_WatchUsdPerTokenUpdated_Call {
-	return &PriceRegistryInterface_WatchUsdPerTokenUpdated_Call{Call: _e.mock.On("WatchUsdPerTokenUpdated", opts, sink, token)}
-}
-
-func (_c *PriceRegistryInterface_WatchUsdPerTokenUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryUsdPerTokenUpdated, token []common.Address)) *PriceRegistryInterface_WatchUsdPerTokenUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryUsdPerTokenUpdated), args[2].([]common.Address))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchUsdPerTokenUpdated_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchUsdPerTokenUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchUsdPerTokenUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryUsdPerTokenUpdated, []common.Address) (event.Subscription, error)) *PriceRegistryInterface_WatchUsdPerTokenUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WatchUsdPerUnitGasUpdated provides a mock function with given fields: opts, sink, destChain
-func (_m *PriceRegistryInterface) WatchUsdPerUnitGasUpdated(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryUsdPerUnitGasUpdated, destChain []uint64) (event.Subscription, error) {
-	ret := _m.Called(opts, sink, destChain)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WatchUsdPerUnitGasUpdated")
-	}
-
-	var r0 event.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryUsdPerUnitGasUpdated, []uint64) (event.Subscription, error)); ok {
-		return rf(opts, sink, destChain)
-	}
-	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryUsdPerUnitGasUpdated, []uint64) event.Subscription); ok {
-		r0 = rf(opts, sink, destChain)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(event.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryUsdPerUnitGasUpdated, []uint64) error); ok {
-		r1 = rf(opts, sink, destChain)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PriceRegistryInterface_WatchUsdPerUnitGasUpdated_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WatchUsdPerUnitGasUpdated'
-type PriceRegistryInterface_WatchUsdPerUnitGasUpdated_Call struct {
-	*mock.Call
-}
-
-// WatchUsdPerUnitGasUpdated is a helper method to define mock.On call
-//   - opts *bind.WatchOpts
-//   - sink chan<- *price_registry.PriceRegistryUsdPerUnitGasUpdated
-//   - destChain []uint64
-func (_e *PriceRegistryInterface_Expecter) WatchUsdPerUnitGasUpdated(opts interface{}, sink interface{}, destChain interface{}) *PriceRegistryInterface_WatchUsdPerUnitGasUpdated_Call {
-	return &PriceRegistryInterface_WatchUsdPerUnitGasUpdated_Call{Call: _e.mock.On("WatchUsdPerUnitGasUpdated", opts, sink, destChain)}
-}
-
-func (_c *PriceRegistryInterface_WatchUsdPerUnitGasUpdated_Call) Run(run func(opts *bind.WatchOpts, sink chan<- *price_registry.PriceRegistryUsdPerUnitGasUpdated, destChain []uint64)) *PriceRegistryInterface_WatchUsdPerUnitGasUpdated_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*bind.WatchOpts), args[1].(chan<- *price_registry.PriceRegistryUsdPerUnitGasUpdated), args[2].([]uint64))
-	})
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchUsdPerUnitGasUpdated_Call) Return(_a0 event.Subscription, _a1 error) *PriceRegistryInterface_WatchUsdPerUnitGasUpdated_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *PriceRegistryInterface_WatchUsdPerUnitGasUpdated_Call) RunAndReturn(run func(*bind.WatchOpts, chan<- *price_registry.PriceRegistryUsdPerUnitGasUpdated, []uint64) (event.Subscription, error)) *PriceRegistryInterface_WatchUsdPerUnitGasUpdated_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// NewPriceRegistryInterface creates a new instance of PriceRegistryInterface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewPriceRegistryInterface(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *PriceRegistryInterface {
-	mock := &PriceRegistryInterface{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/core/scripts/ccip/manual-execution/go.mod b/core/scripts/ccip/manual-execution/go.mod
index 8d646c03f8..ec295ec868 100644
--- a/core/scripts/ccip/manual-execution/go.mod
+++ b/core/scripts/ccip/manual-execution/go.mod
@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/ethereum/go-ethereum v1.11.3
 	github.com/pkg/errors v0.9.1
-	github.com/smartcontractkit/chain-selectors v1.0.21
+	github.com/smartcontractkit/chain-selectors v1.0.23
 	go.uber.org/multierr v1.1.0
 	golang.org/x/crypto v0.1.0
 )
diff --git a/core/scripts/ccip/manual-execution/go.sum b/core/scripts/ccip/manual-execution/go.sum
index d79872f13f..a5bf3ee297 100644
--- a/core/scripts/ccip/manual-execution/go.sum
+++ b/core/scripts/ccip/manual-execution/go.sum
@@ -70,8 +70,8 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU=
 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/smartcontractkit/chain-selectors v1.0.21 h1:KCR9SA7PhOexaBzFieHoLv1WonwhVOPtOStpqTmLC4E=
-github.com/smartcontractkit/chain-selectors v1.0.21/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
+github.com/smartcontractkit/chain-selectors v1.0.23 h1:D2Eaex4Cw/O7Lg3tX6WklOqnjjIQAEBnutCtksPzVDY=
+github.com/smartcontractkit/chain-selectors v1.0.23/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
diff --git a/core/scripts/ccip/revert-reason/handler/reason.go b/core/scripts/ccip/revert-reason/handler/reason.go
index 2e41935ffa..7256b85856 100644
--- a/core/scripts/ccip/revert-reason/handler/reason.go
+++ b/core/scripts/ccip/revert-reason/handler/reason.go
@@ -19,12 +19,12 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/commit_store"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_offramp"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_onramp"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/lock_release_token_pool"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/lock_release_token_pool_1_4_0"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/maybe_revert_message_receiver"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_contract"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/token_admin_registry"
@@ -144,7 +144,7 @@ func getAllABIs() []string {
 		usdc_token_pool.USDCTokenPoolABI,
 		commit_store.CommitStoreABI,
 		token_admin_registry.TokenAdminRegistryABI,
-		price_registry.PriceRegistryABI,
+		fee_quoter.FeeQuoterABI,
 		evm_2_evm_onramp.EVM2EVMOnRampABI,
 		evm_2_evm_offramp.EVM2EVMOffRampABI,
 		router.RouterABI,
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 13ed1c4aa9..7ee9ff2513 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.17.0
 	github.com/shopspring/decimal v1.4.0
-	github.com/smartcontractkit/chain-selectors v1.0.21
+	github.com/smartcontractkit/chain-selectors v1.0.23
 	github.com/smartcontractkit/chainlink-automation v1.0.4
 	github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
@@ -274,7 +274,6 @@ require (
 	github.com/sethvargo/go-retry v0.2.4 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/shirou/gopsutil/v3 v3.24.3 // indirect
-	github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240718160222-2dc0c8136bfa // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 468c13a670..192357740f 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1066,12 +1066,10 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/smartcontractkit/chain-selectors v1.0.21 h1:KCR9SA7PhOexaBzFieHoLv1WonwhVOPtOStpqTmLC4E=
-github.com/smartcontractkit/chain-selectors v1.0.21/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
+github.com/smartcontractkit/chain-selectors v1.0.23 h1:D2Eaex4Cw/O7Lg3tX6WklOqnjjIQAEBnutCtksPzVDY=
+github.com/smartcontractkit/chain-selectors v1.0.23/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
-github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f h1:lQZBOjeYFpCdk0mGQUhbrJipd00tu49xK4zSijC/9Co=
-github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f/go.mod h1:/ZWraCBaDDgaIN1prixYcbVvIk/6HeED9+8zbWQ+TMo=
 github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834 h1:pTf4xdcmiWBqWZ6rTy2RMTDBzhHk89VC1pM7jXKQztI=
 github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834/go.mod h1:fh9eBbrReCmv31bfz52ENCAMa7nTKQbdhb2B3+S2VGo=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 h1:NBQLtqk8zsyY4qTJs+NElI3aDFTcAo83JHvqD04EvB0=
diff --git a/core/scripts/vrfv2plus/testnet/proofs.go b/core/scripts/vrfv2plus/testnet/proofs.go
index 23ddc8ecfd..ea6943c63f 100644
--- a/core/scripts/vrfv2plus/testnet/proofs.go
+++ b/core/scripts/vrfv2plus/testnet/proofs.go
@@ -54,7 +54,7 @@ var rcTemplate = `{
 `
 
 func generateProofForV2Plus(e helpers.Environment) {
-	deployCmd := flag.NewFlagSet("generate-proof", flag.ExitOnError)
+	deployCmd := flag.NewFlagSet("generate-proof-v2-plus", flag.ExitOnError)
 
 	keyHashString := deployCmd.String("key-hash", "", "key hash for VRF request")
 	preSeedString := deployCmd.String("pre-seed", "", "pre-seed for VRF request")
diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go
index a759f0ee11..94619b7ce6 100644
--- a/core/services/chainlink/application.go
+++ b/core/services/chainlink/application.go
@@ -8,8 +8,6 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/google/uuid"
@@ -529,18 +527,6 @@ func NewApplication(opts ApplicationOpts) (Application, error) {
 			cfg.Insecure(),
 			opts.RelayerChainInteroperators,
 		)
-		delegates[job.CCIP] = ccip.NewDelegate(
-			globalLogger,
-			loopRegistrarConfig,
-			pipelineRunner,
-			opts.RelayerChainInteroperators.LegacyEVMChains(),
-			capabilityRegistrySyncer,
-			opts.KeyStore,
-			opts.DS,
-			peerWrapper,
-			telemetryManager,
-			cfg.Capabilities(),
-		)
 	} else {
 		globalLogger.Debug("Off-chain reporting v2 disabled")
 	}
diff --git a/core/services/headreporter/head_reporter.go b/core/services/headreporter/head_reporter.go
index f81a6acf91..94de8ae2be 100644
--- a/core/services/headreporter/head_reporter.go
+++ b/core/services/headreporter/head_reporter.go
@@ -35,11 +35,12 @@ type (
 
 func NewHeadReporterService(ds sqlutil.DataSource, lggr logger.Logger, reporters ...HeadReporter) *HeadReporterService {
 	return &HeadReporterService{
-		ds:        ds,
-		lggr:      lggr.Named("HeadReporter"),
-		newHeads:  mailbox.NewSingle[*evmtypes.Head](),
-		chStop:    make(chan struct{}),
-		reporters: reporters,
+		ds:           ds,
+		lggr:         lggr.Named("HeadReporter"),
+		newHeads:     mailbox.NewSingle[*evmtypes.Head](),
+		chStop:       make(chan struct{}),
+		reporters:    reporters,
+		reportPeriod: 15 * time.Second,
 	}
 }
 
diff --git a/core/services/headreporter/head_reporter_test.go b/core/services/headreporter/head_reporter_test.go
index ded7e1fb61..304dd59a47 100644
--- a/core/services/headreporter/head_reporter_test.go
+++ b/core/services/headreporter/head_reporter_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
@@ -42,4 +43,9 @@ func Test_HeadReporterService(t *testing.T) {
 
 		require.Eventually(t, func() bool { return reportCalls.Load() == 2 }, 5*time.Second, 100*time.Millisecond)
 	})
+
+	t.Run("has default report period", func(t *testing.T) {
+		service := NewHeadReporterService(pgtest.NewSqlxDB(t), logger.TestLogger(t), NewMockHeadReporter(t))
+		assert.Equal(t, service.reportPeriod, 15*time.Second)
+	})
 }
diff --git a/core/services/headreporter/telemetry_reporter.go b/core/services/headreporter/telemetry_reporter.go
index 93852f44c0..0d93ca59a4 100644
--- a/core/services/headreporter/telemetry_reporter.go
+++ b/core/services/headreporter/telemetry_reporter.go
@@ -44,6 +44,7 @@ func (t *telemetryReporter) ReportNewHead(ctx context.Context, head *evmtypes.He
 		}
 	}
 	request := &telem.HeadReportRequest{
+		ChainID: head.EVMChainID.String(),
 		Latest: &telem.Block{
 			Timestamp: uint64(head.Timestamp.UTC().Unix()),
 			Number:    uint64(head.Number),
diff --git a/core/services/headreporter/telemetry_reporter_test.go b/core/services/headreporter/telemetry_reporter_test.go
index 58c0935490..85bfea5866 100644
--- a/core/services/headreporter/telemetry_reporter_test.go
+++ b/core/services/headreporter/telemetry_reporter_test.go
@@ -35,6 +35,7 @@ func Test_TelemetryReporter_NewHead(t *testing.T) {
 		},
 	}
 	requestBytes, err := proto.Marshal(&telem.HeadReportRequest{
+		ChainID: "100",
 		Latest: &telem.Block{
 			Timestamp: uint64(head.Timestamp.UTC().Unix()),
 			Number:    42,
@@ -70,6 +71,7 @@ func Test_TelemetryReporter_NewHeadMissingFinalized(t *testing.T) {
 		IsFinalized: false,
 	}
 	requestBytes, err := proto.Marshal(&telem.HeadReportRequest{
+		ChainID: "100",
 		Latest: &telem.Block{
 			Timestamp: uint64(head.Timestamp.UTC().Unix()),
 			Number:    42,
diff --git a/core/services/job/job_orm_test.go b/core/services/job/job_orm_test.go
index c26cf828cc..37be1b7955 100644
--- a/core/services/job/job_orm_test.go
+++ b/core/services/job/job_orm_test.go
@@ -7,8 +7,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/validate"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/google/uuid"
 	"github.com/lib/pq"
@@ -433,39 +431,6 @@ func TestORM_DeleteJob_DeletesAssociatedRecords(t *testing.T) {
 		cltest.AssertCount(t, db, "jobs", 0)
 	})
 
-	t.Run("it creates and deletes records for ccip jobs", func(t *testing.T) {
-		ctx := testutils.Context(t)
-		p2pKey, err := keyStore.P2P().Create(ctx)
-		require.NoError(t, err)
-		specArgs := validate.SpecArgs{
-			P2PV2Bootstrappers: []string{
-				fmt.Sprintf("%s@somechainlinknode.com:%d", p2pKey.ID(), 8080),
-			},
-			CapabilityVersion:      "v1.0.0",
-			CapabilityLabelledName: "ccip",
-			OCRKeyBundleIDs: map[string]string{
-				relay.NetworkEVM: cltest.DefaultOCRKey.ID(),
-			},
-			P2PKeyID: p2pKey.ID(),
-			PluginConfig: map[string]any{
-				"pricesPipeline": ".... the pipeline ....",
-			},
-		}
-		specToml, err := validate.NewCCIPSpecToml(specArgs)
-		require.NoError(t, err)
-		jb, err := validate.ValidatedCCIPSpec(specToml)
-		require.NoError(t, err)
-
-		err = jobORM.CreateJob(ctx, &jb)
-		require.NoError(t, err)
-		cltest.AssertCount(t, db, "ccip_specs", 1)
-		cltest.AssertCount(t, db, "jobs", 1)
-		err = jobORM.DeleteJob(ctx, jb.ID)
-		require.NoError(t, err)
-		cltest.AssertCount(t, db, "ccip_specs", 0)
-		cltest.AssertCount(t, db, "jobs", 0)
-	})
-
 	t.Run("it deletes records for webhook jobs", func(t *testing.T) {
 		ctx := testutils.Context(t)
 		ei := cltest.MustInsertExternalInitiator(t, bridges.NewORM(db))
@@ -666,89 +631,6 @@ func TestORM_CreateJob_VRFV2Plus(t *testing.T) {
 	cltest.AssertCount(t, db, "jobs", 0)
 }
 
-func TestORM_CreateJob_CCIP(t *testing.T) {
-	ctx := testutils.Context(t)
-	config := configtest.NewTestGeneralConfig(t)
-	db := pgtest.NewSqlxDB(t)
-	keyStore := cltest.NewKeyStore(t, db)
-	require.NoError(t, keyStore.OCR().Add(ctx, cltest.DefaultOCRKey))
-
-	p2pKey, err := keyStore.P2P().Create(ctx)
-	require.NoError(t, err)
-
-	lggr := logger.TestLogger(t)
-	pipelineORM := pipeline.NewORM(db, lggr, config.JobPipeline().MaxSuccessfulRuns())
-	bridgesORM := bridges.NewORM(db)
-	jobORM := NewTestORM(t, db, pipelineORM, bridgesORM, keyStore)
-
-	specArgs := validate.SpecArgs{
-		P2PV2Bootstrappers: []string{
-			fmt.Sprintf("%s@somechainlinknode.com:%d", p2pKey.ID(), 8080),
-		},
-		CapabilityVersion:      "v1.0.0",
-		CapabilityLabelledName: "ccip",
-		OCRKeyBundleIDs: map[string]string{
-			relay.NetworkEVM: cltest.DefaultOCRKey.ID(),
-		},
-		P2PKeyID: p2pKey.ID(),
-		RelayConfigs: map[string]any{
-			"hello": "world",
-		},
-		PluginConfig: map[string]any{
-			"pricesPipeline": ".... the pipeline ....",
-		},
-	}
-	specToml, err := validate.NewCCIPSpecToml(specArgs)
-	require.NoError(t, err)
-	jb, err := validate.ValidatedCCIPSpec(specToml)
-	require.NoError(t, err)
-
-	require.NoError(t, jobORM.CreateJob(ctx, &jb))
-	cltest.AssertCount(t, db, "ccip_specs", 1)
-	cltest.AssertCount(t, db, "jobs", 1)
-
-	var capabilityVersion string
-	require.NoError(t, db.Get(&capabilityVersion, `SELECT capability_version FROM ccip_specs LIMIT 1`))
-	require.Equal(t, specArgs.CapabilityVersion, capabilityVersion)
-
-	var capabilityLabelledName string
-	require.NoError(t, db.Get(&capabilityLabelledName, `SELECT capability_labelled_name FROM ccip_specs LIMIT 1`))
-	require.Equal(t, specArgs.CapabilityLabelledName, capabilityLabelledName)
-
-	var ocrKeyBundleIDs job.JSONConfig
-	require.NoError(t, db.Get(&ocrKeyBundleIDs, `SELECT ocr_key_bundle_ids FROM ccip_specs LIMIT 1`))
-	actual, ok := ocrKeyBundleIDs[relay.NetworkEVM]
-	require.True(t, ok)
-	actualStr, ok := actual.(string)
-	require.True(t, ok)
-	require.Equal(t, specArgs.OCRKeyBundleIDs[relay.NetworkEVM], actualStr)
-
-	var p2pV2Bootstrappers pq.StringArray
-	require.NoError(t, db.Get(&p2pV2Bootstrappers, `SELECT p2pv2_bootstrappers FROM ccip_specs LIMIT 1`))
-	require.Len(t, p2pV2Bootstrappers, len(specArgs.P2PV2Bootstrappers))
-	require.Equal(t, specArgs.P2PV2Bootstrappers[0], p2pV2Bootstrappers[0])
-
-	var p2pKeyID string
-	require.NoError(t, db.Get(&p2pKeyID, `SELECT p2p_key_id FROM ccip_specs LIMIT 1`))
-	require.Equal(t, p2pKey.ID(), p2pKeyID)
-
-	var relayConfigs job.JSONConfig
-	require.NoError(t, db.Get(&relayConfigs, `SELECT relay_configs FROM ccip_specs LIMIT 1`))
-	actual, ok = relayConfigs["hello"]
-	require.True(t, ok)
-	actualStr, ok = actual.(string)
-	require.True(t, ok)
-	require.Equal(t, specArgs.RelayConfigs["hello"], actualStr)
-
-	var pluginConfig job.JSONConfig
-	require.NoError(t, db.Get(&pluginConfig, `SELECT plugin_config FROM ccip_specs LIMIT 1`))
-	actual, ok = pluginConfig["pricesPipeline"]
-	require.True(t, ok)
-	actualStr, ok = actual.(string)
-	require.True(t, ok)
-	require.Equal(t, specArgs.PluginConfig["pricesPipeline"], actualStr)
-}
-
 func TestORM_CreateJob_OCRBootstrap(t *testing.T) {
 	ctx := testutils.Context(t)
 	config := configtest.NewTestGeneralConfig(t)
diff --git a/core/services/ocr2/plugins/ccip/ccipcommit/ocr2_test.go b/core/services/ocr2/plugins/ccip/ccipcommit/ocr2_test.go
index f1ca4d91cd..b02b7138a1 100644
--- a/core/services/ocr2/plugins/ccip/ccipcommit/ocr2_test.go
+++ b/core/services/ocr2/plugins/ccip/ccipcommit/ocr2_test.go
@@ -20,15 +20,13 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
-
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/config"
 	"github.com/smartcontractkit/chainlink-common/pkg/hashutil"
 	"github.com/smartcontractkit/chainlink-common/pkg/merklemulti"
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
-
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/mocks"
 	mocks2 "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
@@ -45,7 +43,6 @@ import (
 	ccipdatamocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0"
-
 	ccipdbmocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdb/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/prices"
 )
@@ -410,7 +407,9 @@ func TestCommitReportingPlugin_Report(t *testing.T) {
 
 			evmEstimator := mocks.NewEvmFeeEstimator(t)
 			evmEstimator.On("L1Oracle").Return(nil)
-			gasPriceEstimator := prices.NewDAGasPriceEstimator(evmEstimator, nil, 2e9, 2e9) // 200% deviation
+
+			feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+			gasPriceEstimator := prices.NewDAGasPriceEstimator(evmEstimator, nil, 2e9, 2e9, feeEstimatorConfig) // 200% deviation
 
 			var destTokens []cciptypes.Address
 			for tk := range tc.tokenDecimals {
@@ -434,7 +433,7 @@ func TestCommitReportingPlugin_Report(t *testing.T) {
 			})).Return(destDecimals, nil).Maybe()
 
 			lp := mocks2.NewLogPoller(t)
-			commitStoreReader, err := v1_2_0.NewCommitStore(logger.TestLogger(t), utils.RandomAddress(), nil, lp)
+			commitStoreReader, err := v1_2_0.NewCommitStore(logger.TestLogger(t), utils.RandomAddress(), nil, lp, feeEstimatorConfig)
 			assert.NoError(t, err)
 
 			healthCheck := ccipcachemocks.NewChainHealthcheck(t)
@@ -1532,6 +1531,7 @@ func TestCommitReportingPlugin_calculatePriceUpdates(t *testing.T) {
 				nil,
 				tc.daGasPriceDeviationPPB,
 				tc.execGasPriceDeviationPPB,
+				ccipdatamocks.NewFeeEstimatorConfigReader(t),
 			)
 
 			r := &CommitReportingPlugin{
diff --git a/core/services/ocr2/plugins/ccip/ccipexec/batching.go b/core/services/ocr2/plugins/ccip/ccipexec/batching.go
index b457dd986d..f096953f5d 100644
--- a/core/services/ocr2/plugins/ccip/ccipexec/batching.go
+++ b/core/services/ocr2/plugins/ccip/ccipexec/batching.go
@@ -24,6 +24,12 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/statuschecker"
 )
 
+// Batching strategies
+const (
+	BestEffortBatchingStrategyID = uint32(0)
+	ZKOverflowBatchingStrategyID = uint32(1)
+)
+
 type BatchContext struct {
 	report                     commitReportWithSendRequests
 	inflight                   []InflightInternalExecutionReport
@@ -47,6 +53,7 @@ type BatchContext struct {
 
 type BatchingStrategy interface {
 	BuildBatch(ctx context.Context, batchCtx *BatchContext) ([]ccip.ObservedMessage, []messageExecStatus)
+	GetBatchingStrategyID() uint32
 }
 
 type BestEffortBatchingStrategy struct{}
@@ -58,9 +65,9 @@ type ZKOverflowBatchingStrategy struct {
 func NewBatchingStrategy(batchingStrategyID uint32, statusChecker statuschecker.CCIPTransactionStatusChecker) (BatchingStrategy, error) {
 	var batchingStrategy BatchingStrategy
 	switch batchingStrategyID {
-	case 0:
+	case BestEffortBatchingStrategyID:
 		batchingStrategy = &BestEffortBatchingStrategy{}
-	case 1:
+	case ZKOverflowBatchingStrategyID:
 		batchingStrategy = &ZKOverflowBatchingStrategy{
 			statuschecker: statusChecker,
 		}
@@ -70,6 +77,10 @@ func NewBatchingStrategy(batchingStrategyID uint32, statusChecker statuschecker.
 	return batchingStrategy, nil
 }
 
+func (s *BestEffortBatchingStrategy) GetBatchingStrategyID() uint32 {
+	return BestEffortBatchingStrategyID
+}
+
 // BestEffortBatchingStrategy is a batching strategy that tries to batch as many messages as possible (up to certain limits).
 func (s *BestEffortBatchingStrategy) BuildBatch(
 	ctx context.Context,
@@ -95,6 +106,10 @@ func (s *BestEffortBatchingStrategy) BuildBatch(
 	return batchBuilder.batch, batchBuilder.statuses
 }
 
+func (bs *ZKOverflowBatchingStrategy) GetBatchingStrategyID() uint32 {
+	return ZKOverflowBatchingStrategyID
+}
+
 // ZKOverflowBatchingStrategy is a batching strategy for ZK chains overflowing under certain conditions.
 // It is a simple batching strategy that only allows one message to be added to the batch.
 // TXM is used to perform the ZK check: if the message failed the check, it will be skipped.
diff --git a/core/services/ocr2/plugins/ccip/ccipexec/batching_test.go b/core/services/ocr2/plugins/ccip/ccipexec/batching_test.go
index 3647556a6d..4393fc5f58 100644
--- a/core/services/ocr2/plugins/ccip/ccipexec/batching_test.go
+++ b/core/services/ocr2/plugins/ccip/ccipexec/batching_test.go
@@ -850,13 +850,13 @@ func runBatchingStrategyTests(t *testing.T, strategy BatchingStrategy, available
 
 			seqNrs, execStates := strategy.BuildBatch(context.Background(), batchContext)
 
-			runAssertions(t, tc, seqNrs, execStates)
+			runAssertions(t, tc, seqNrs, execStates, strategy)
 		})
 	}
 }
 
 // Utility function to run common assertions
-func runAssertions(t *testing.T, tc testCase, seqNrs []ccip.ObservedMessage, execStates []messageExecStatus) {
+func runAssertions(t *testing.T, tc testCase, seqNrs []ccip.ObservedMessage, execStates []messageExecStatus, strategy BatchingStrategy) {
 	if tc.expectedSeqNrs == nil {
 		assert.Len(t, seqNrs, 0)
 	} else {
@@ -868,6 +868,13 @@ func runAssertions(t *testing.T, tc testCase, seqNrs []ccip.ObservedMessage, exe
 	} else {
 		assert.Equal(t, tc.expectedStates, execStates)
 	}
+
+	batchingStratID := strategy.GetBatchingStrategyID()
+	if strategyType := reflect.TypeOf(strategy); strategyType == reflect.TypeOf(&BestEffortBatchingStrategy{}) {
+		assert.Equal(t, batchingStratID, uint32(0))
+	} else {
+		assert.Equal(t, batchingStratID, uint32(1))
+	}
 }
 
 func createTestMessage(seqNr uint64, sender cciptypes.Address, nonce uint64, feeToken cciptypes.Address, feeAmount *big.Int, executed bool, data []byte) cciptypes.EVM2EVMOnRampCCIPSendRequestedWithMeta {
diff --git a/core/services/ocr2/plugins/ccip/ccipexec/initializers.go b/core/services/ocr2/plugins/ccip/ccipexec/initializers.go
index c8d079b263..aa42ff2828 100644
--- a/core/services/ocr2/plugins/ccip/ccipexec/initializers.go
+++ b/core/services/ocr2/plugins/ccip/ccipexec/initializers.go
@@ -18,8 +18,6 @@ import (
 
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipcalc"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/statuschecker"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
@@ -27,6 +25,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
 	ccipconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/config"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipcalc"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/factory"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/observability"
diff --git a/core/services/ocr2/plugins/ccip/ccipexec/ocr2.go b/core/services/ocr2/plugins/ccip/ccipexec/ocr2.go
index 4a09cf37b4..2c70cac497 100644
--- a/core/services/ocr2/plugins/ccip/ccipexec/ocr2.go
+++ b/core/services/ocr2/plugins/ccip/ccipexec/ocr2.go
@@ -468,6 +468,19 @@ func (r *ExecutionReportingPlugin) buildReport(ctx context.Context, lggr logger.
 	return encodedReport, nil
 }
 
+// Returns required number of observations to reach consensus
+func (r *ExecutionReportingPlugin) getConsensusThreshold() int {
+	// Default consensus threshold is F+1
+	consensusThreshold := r.F + 1
+	if r.batchingStrategy.GetBatchingStrategyID() == ZKOverflowBatchingStrategyID {
+		// For batching strategy 1, consensus threshold is 2F+1
+		// This is because chains that can overflow need to reach consensus during the inflight cache period
+		// to avoid 2 transmissions round of an overflown message.
+		consensusThreshold = 2*r.F + 1
+	}
+	return consensusThreshold
+}
+
 func (r *ExecutionReportingPlugin) Report(ctx context.Context, timestamp types.ReportTimestamp, query types.Query, observations []types.AttributedObservation) (bool, types.Report, error) {
 	lggr := r.lggr.Named("ExecutionReport")
 	if healthy, err := r.chainHealthcheck.IsHealthy(ctx); err != nil {
@@ -475,14 +488,16 @@ func (r *ExecutionReportingPlugin) Report(ctx context.Context, timestamp types.R
 	} else if !healthy {
 		return false, nil, ccip.ErrChainIsNotHealthy
 	}
+	consensusThreshold := r.getConsensusThreshold()
+	lggr.Infof("Consensus threshold set to: %d", consensusThreshold)
+
 	parsableObservations := ccip.GetParsableObservations[ccip.ExecutionObservation](lggr, observations)
-	// Need at least F+1 observations
-	if len(parsableObservations) <= r.F {
-		lggr.Warn("Non-empty observations <= F, need at least F+1 to continue")
+	if len(parsableObservations) < consensusThreshold {
+		lggr.Warnf("Insufficient observations: only %d received, but need more than %d to proceed", len(parsableObservations), consensusThreshold)
 		return false, nil, nil
 	}
 
-	observedMessages, err := calculateObservedMessagesConsensus(parsableObservations, r.F)
+	observedMessages, err := calculateObservedMessagesConsensus(parsableObservations, consensusThreshold)
 	if err != nil {
 		return false, nil, err
 	}
diff --git a/core/services/ocr2/plugins/ccip/ccipexec/ocr2_test.go b/core/services/ocr2/plugins/ccip/ccipexec/ocr2_test.go
index 84cb73c664..fea05ab61c 100644
--- a/core/services/ocr2/plugins/ccip/ccipexec/ocr2_test.go
+++ b/core/services/ocr2/plugins/ccip/ccipexec/ocr2_test.go
@@ -16,17 +16,18 @@ import (
 	mapset "github.com/deckarep/golang-set/v2"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/pkg/errors"
-	"github.com/smartcontractkit/libocr/commontypes"
-	"github.com/smartcontractkit/libocr/offchainreporting2/types"
-	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
+	"github.com/smartcontractkit/libocr/commontypes"
+	"github.com/smartcontractkit/libocr/offchainreporting2/types"
+	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
+	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
 	lpMocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache"
@@ -41,8 +42,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/prices"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/testhelpers"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/tokendata"
-
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/statuschecker"
 )
 
 func TestExecutionReportingPlugin_Observation(t *testing.T) {
@@ -233,19 +233,21 @@ func TestExecutionReportingPlugin_Observation(t *testing.T) {
 
 func TestExecutionReportingPlugin_Report(t *testing.T) {
 	testCases := []struct {
-		name            string
-		f               int
-		committedSeqNum uint64
-		observations    []ccip.ExecutionObservation
+		name               string
+		f                  int
+		batchingStrategyId uint32
+		committedSeqNum    uint64
+		observations       []ccip.ExecutionObservation
 
 		expectingSomeReport bool
 		expectedReport      cciptypes.ExecReport
 		expectingSomeErr    bool
 	}{
 		{
-			name:            "not enough observations to form consensus",
-			f:               5,
-			committedSeqNum: 5,
+			name:               "not enough observations to form consensus - best effort batching",
+			f:                  5,
+			batchingStrategyId: 0,
+			committedSeqNum:    5,
 			observations: []ccip.ExecutionObservation{
 				{Messages: map[uint64]ccip.MsgData{3: {}, 4: {}}},
 				{Messages: map[uint64]ccip.MsgData{3: {}, 4: {}}},
@@ -253,6 +255,21 @@ func TestExecutionReportingPlugin_Report(t *testing.T) {
 			expectingSomeErr:    false,
 			expectingSomeReport: false,
 		},
+		{
+			name:               "not enough observaitons to form consensus - zk batching",
+			f:                  5,
+			batchingStrategyId: 1,
+			committedSeqNum:    5,
+			observations: []ccip.ExecutionObservation{
+				{Messages: map[uint64]ccip.MsgData{3: {}, 4: {}}},
+				{Messages: map[uint64]ccip.MsgData{3: {}, 4: {}}},
+				{Messages: map[uint64]ccip.MsgData{3: {}, 4: {}}},
+				{Messages: map[uint64]ccip.MsgData{3: {}, 4: {}}},
+				{Messages: map[uint64]ccip.MsgData{3: {}, 4: {}}},
+				{Messages: map[uint64]ccip.MsgData{3: {}, 4: {}}},
+				{Messages: map[uint64]ccip.MsgData{3: {}, 4: {}}},
+			},
+		},
 		{
 			name:                "zero observations",
 			f:                   0,
@@ -269,6 +286,9 @@ func TestExecutionReportingPlugin_Report(t *testing.T) {
 			p := ExecutionReportingPlugin{}
 			p.lggr = logger.TestLogger(t)
 			p.F = tc.f
+			bs, err := NewBatchingStrategy(tc.batchingStrategyId, &statuschecker.TxmStatusChecker{})
+			assert.NoError(t, err)
+			p.batchingStrategy = bs
 
 			p.commitStoreReader = ccipdatamocks.NewCommitStoreReader(t)
 			chainHealthcheck := ccipcachemocks.NewChainHealthcheck(t)
@@ -282,12 +302,12 @@ func TestExecutionReportingPlugin_Report(t *testing.T) {
 				observations[i] = types.AttributedObservation{Observation: b, Observer: commontypes.OracleID(i + 1)}
 			}
 
-			_, _, err := p.Report(ctx, types.ReportTimestamp{}, types.Query{}, observations)
+			_, _, err2 := p.Report(ctx, types.ReportTimestamp{}, types.Query{}, observations)
 			if tc.expectingSomeErr {
-				assert.Error(t, err)
+				assert.Error(t, err2)
 				return
 			}
-			assert.NoError(t, err)
+			assert.NoError(t, err2)
 		})
 	}
 }
@@ -428,8 +448,10 @@ func TestExecutionReportingPlugin_buildReport(t *testing.T) {
 	p.metricsCollector = ccip.NoopMetricsCollector
 	p.commitStoreReader = commitStore
 
+	feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
 	lp := lpMocks.NewLogPoller(t)
-	offRampReader, err := v1_0_0.NewOffRamp(logger.TestLogger(t), utils.RandomAddress(), nil, lp, nil, nil)
+	offRampReader, err := v1_0_0.NewOffRamp(logger.TestLogger(t), utils.RandomAddress(), nil, lp, nil, nil, feeEstimatorConfig)
 	assert.NoError(t, err)
 	p.offRampReader = offRampReader
 
@@ -1376,7 +1398,9 @@ func Test_prepareTokenExecData(t *testing.T) {
 }
 
 func encodeExecutionReport(t *testing.T, report cciptypes.ExecReport) []byte {
-	reader, err := v1_2_0.NewOffRamp(logger.TestLogger(t), utils.RandomAddress(), nil, nil, nil, nil)
+	feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
+	reader, err := v1_2_0.NewOffRamp(logger.TestLogger(t), utils.RandomAddress(), nil, nil, nil, nil, feeEstimatorConfig)
 	require.NoError(t, err)
 	ctx := testutils.Context(t)
 	encodedReport, err := reader.EncodeExecutionReport(ctx, report)
@@ -1419,3 +1443,37 @@ func TestExecutionReportingPlugin_ensurePriceRegistrySynchronization(t *testing.
 	require.NoError(t, err)
 	require.Equal(t, mockPriceRegistryReader2, p.sourcePriceRegistry)
 }
+
+func TestExecutionReportingPlugin_getConsensusThreshold(t *testing.T) {
+	tests := []struct {
+		name                       string
+		batchingStrategyID         uint32
+		F                          int
+		expectedConsensusThreshold int
+	}{
+		{
+			name:                       "zk batching strategy",
+			batchingStrategyID:         uint32(1),
+			F:                          5,
+			expectedConsensusThreshold: 11,
+		},
+		{
+			name:                       "default batching strategy",
+			batchingStrategyID:         uint32(0),
+			F:                          5,
+			expectedConsensusThreshold: 6,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			p := &ExecutionReportingPlugin{}
+			p.F = tc.F
+			bs, err := NewBatchingStrategy(tc.batchingStrategyID, &statuschecker.TxmStatusChecker{})
+			assert.NoError(t, err)
+			p.batchingStrategy = bs
+
+			require.Equal(t, tc.expectedConsensusThreshold, p.getConsensusThreshold())
+		})
+	}
+}
diff --git a/core/services/ocr2/plugins/ccip/config/type_and_version.go b/core/services/ocr2/plugins/ccip/config/type_and_version.go
index fdfd892b08..00e3b26d4e 100644
--- a/core/services/ocr2/plugins/ccip/config/type_and_version.go
+++ b/core/services/ocr2/plugins/ccip/config/type_and_version.go
@@ -19,6 +19,7 @@ var (
 	EVM2EVMOffRamp ContractType = "EVM2EVMOffRamp"
 	CommitStore    ContractType = "CommitStore"
 	PriceRegistry  ContractType = "PriceRegistry"
+	Unknown        ContractType = "Unknown" // 1.0.0 Contracts which have no TypeAndVersion
 	ContractTypes               = mapset.NewSet[ContractType](
 		EVM2EVMOffRamp,
 		EVM2EVMOnRamp,
@@ -63,7 +64,13 @@ func TypeAndVersion(addr common.Address, client bind.ContractBackend) (ContractT
 	return ContractType(contractType), *v, nil
 }
 
+// default version to use when TypeAndVersion is missing.
+const defaultVersion = "1.0.0"
+
 func ParseTypeAndVersion(tvStr string) (string, string, error) {
+	if tvStr == "" {
+		tvStr = string(Unknown) + " " + defaultVersion
+	}
 	typeAndVersionValues := strings.Split(tvStr, " ")
 
 	if len(typeAndVersionValues) < 2 {
diff --git a/core/services/ocr2/plugins/ccip/config/type_and_version_test.go b/core/services/ocr2/plugins/ccip/config/type_and_version_test.go
new file mode 100644
index 0000000000..f626389dcd
--- /dev/null
+++ b/core/services/ocr2/plugins/ccip/config/type_and_version_test.go
@@ -0,0 +1,49 @@
+package config
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParseTypeAndVersion(t *testing.T) {
+	tests := []struct {
+		name            string
+		input           string
+		expectedType    string
+		expectedVersion string
+		expectedError   string
+	}{
+		{
+			name:            "Valid input",
+			input:           string(EVM2EVMOnRamp) + " 1.2.0",
+			expectedType:    string(EVM2EVMOnRamp),
+			expectedVersion: "1.2.0",
+		},
+		{
+			name:            "Empty input",
+			input:           "",
+			expectedType:    string(Unknown),
+			expectedVersion: defaultVersion,
+		},
+		{
+			name:          "Invalid input",
+			input:         "InvalidInput",
+			expectedError: "invalid type and version InvalidInput",
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			actualType, actualVersion, err := ParseTypeAndVersion(tc.input)
+
+			if tc.expectedError != "" {
+				assert.EqualError(t, err, tc.expectedError)
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, tc.expectedType, actualType)
+				assert.Equal(t, tc.expectedVersion, actualVersion)
+			}
+		})
+	}
+}
diff --git a/core/services/ocr2/plugins/ccip/estimatorconfig/config.go b/core/services/ocr2/plugins/ccip/estimatorconfig/config.go
new file mode 100644
index 0000000000..2eda88d441
--- /dev/null
+++ b/core/services/ocr2/plugins/ccip/estimatorconfig/config.go
@@ -0,0 +1,49 @@
+package estimatorconfig
+
+import (
+	"context"
+	"errors"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
+)
+
+// FeeEstimatorConfigProvider implements abstract storage for the DataAvailability settings in onRamp dynamic Config.
+// It's implemented to transfer DA config from different entities offRamp, onRamp, commitStore without injecting the
+// strong dependency between modules. ConfigProvider fetch ccip.OnRampReader object reads and returns only relevant
+// fields for the daGasEstimator from the encapsulated onRampReader.
+type FeeEstimatorConfigProvider interface {
+	SetOnRampReader(reader ccip.OnRampReader)
+	GetDataAvailabilityConfig(ctx context.Context) (destDataAvailabilityOverheadGas, destGasPerDataAvailabilityByte, destDataAvailabilityMultiplierBps int64, err error)
+}
+
+type FeeEstimatorConfigService struct {
+	onRampReader ccip.OnRampReader
+}
+
+func NewFeeEstimatorConfigService() *FeeEstimatorConfigService {
+	return &FeeEstimatorConfigService{}
+}
+
+// SetOnRampReader Sets the onRamp reader instance.
+// must be called once for each instance.
+func (c *FeeEstimatorConfigService) SetOnRampReader(reader ccip.OnRampReader) {
+	c.onRampReader = reader
+}
+
+// GetDataAvailabilityConfig Returns dynamic config data availability parameters.
+// GetDynamicConfig should be cached in the onRamp reader to avoid unnecessary on-chain calls
+func (c *FeeEstimatorConfigService) GetDataAvailabilityConfig(ctx context.Context) (destDataAvailabilityOverheadGas, destGasPerDataAvailabilityByte, destDataAvailabilityMultiplierBps int64, err error) {
+	if c.onRampReader == nil {
+		return 0, 0, 0, errors.New("no OnRampReader has been configured")
+	}
+
+	cfg, err := c.onRampReader.GetDynamicConfig(ctx)
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	return int64(cfg.DestDataAvailabilityOverheadGas),
+		int64(cfg.DestGasPerDataAvailabilityByte),
+		int64(cfg.DestDataAvailabilityMultiplierBps),
+		err
+}
diff --git a/core/services/ocr2/plugins/ccip/estimatorconfig/config_test.go b/core/services/ocr2/plugins/ccip/estimatorconfig/config_test.go
new file mode 100644
index 0000000000..05226f8b48
--- /dev/null
+++ b/core/services/ocr2/plugins/ccip/estimatorconfig/config_test.go
@@ -0,0 +1,45 @@
+package estimatorconfig_test
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/estimatorconfig"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
+)
+
+func TestFeeEstimatorConfigService(t *testing.T) {
+	svc := estimatorconfig.NewFeeEstimatorConfigService()
+	ctx := context.Background()
+
+	var expectedDestDataAvailabilityOverheadGas int64 = 1
+	var expectedDestGasPerDataAvailabilityByte int64 = 2
+	var expectedDestDataAvailabilityMultiplierBps int64 = 3
+
+	onRampReader := mocks.NewOnRampReader(t)
+	_, _, _, err := svc.GetDataAvailabilityConfig(ctx)
+	require.Error(t, err)
+	svc.SetOnRampReader(onRampReader)
+
+	onRampReader.On("GetDynamicConfig", ctx).
+		Return(ccip.OnRampDynamicConfig{
+			DestDataAvailabilityOverheadGas:   uint32(expectedDestDataAvailabilityOverheadGas),
+			DestGasPerDataAvailabilityByte:    uint16(expectedDestGasPerDataAvailabilityByte),
+			DestDataAvailabilityMultiplierBps: uint16(expectedDestDataAvailabilityMultiplierBps),
+		}, nil).Once()
+
+	destDataAvailabilityOverheadGas, destGasPerDataAvailabilityByte, destDataAvailabilityMultiplierBps, err := svc.GetDataAvailabilityConfig(ctx)
+	require.NoError(t, err)
+	require.Equal(t, expectedDestDataAvailabilityOverheadGas, destDataAvailabilityOverheadGas)
+	require.Equal(t, expectedDestGasPerDataAvailabilityByte, destGasPerDataAvailabilityByte)
+	require.Equal(t, expectedDestDataAvailabilityMultiplierBps, destDataAvailabilityMultiplierBps)
+
+	onRampReader.On("GetDynamicConfig", ctx).
+		Return(ccip.OnRampDynamicConfig{}, errors.New("test")).Once()
+	_, _, _, err = svc.GetDataAvailabilityConfig(ctx)
+	require.Error(t, err)
+}
diff --git a/core/services/ocr2/plugins/ccip/exportinternal.go b/core/services/ocr2/plugins/ccip/exportinternal.go
index 2a5767ac85..2f924085fb 100644
--- a/core/services/ocr2/plugins/ccip/exportinternal.go
+++ b/core/services/ocr2/plugins/ccip/exportinternal.go
@@ -37,20 +37,20 @@ func NewEvmPriceRegistry(lp logpoller.LogPoller, ec client.Client, lggr logger.L
 
 type VersionFinder = factory.VersionFinder
 
-func NewCommitStoreReader(lggr logger.Logger, versionFinder VersionFinder, address ccip.Address, ec client.Client, lp logpoller.LogPoller) (ccipdata.CommitStoreReader, error) {
-	return factory.NewCommitStoreReader(lggr, versionFinder, address, ec, lp)
+func NewCommitStoreReader(lggr logger.Logger, versionFinder VersionFinder, address ccip.Address, ec client.Client, lp logpoller.LogPoller, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) (ccipdata.CommitStoreReader, error) {
+	return factory.NewCommitStoreReader(lggr, versionFinder, address, ec, lp, feeEstimatorConfig)
 }
 
-func CloseCommitStoreReader(lggr logger.Logger, versionFinder VersionFinder, address ccip.Address, ec client.Client, lp logpoller.LogPoller) error {
-	return factory.CloseCommitStoreReader(lggr, versionFinder, address, ec, lp)
+func CloseCommitStoreReader(lggr logger.Logger, versionFinder VersionFinder, address ccip.Address, ec client.Client, lp logpoller.LogPoller, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) error {
+	return factory.CloseCommitStoreReader(lggr, versionFinder, address, ec, lp, feeEstimatorConfig)
 }
 
-func NewOffRampReader(lggr logger.Logger, versionFinder VersionFinder, addr ccip.Address, destClient client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int, registerFilters bool) (ccipdata.OffRampReader, error) {
-	return factory.NewOffRampReader(lggr, versionFinder, addr, destClient, lp, estimator, destMaxGasPrice, registerFilters)
+func NewOffRampReader(lggr logger.Logger, versionFinder VersionFinder, addr ccip.Address, destClient client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int, registerFilters bool, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) (ccipdata.OffRampReader, error) {
+	return factory.NewOffRampReader(lggr, versionFinder, addr, destClient, lp, estimator, destMaxGasPrice, registerFilters, feeEstimatorConfig)
 }
 
-func CloseOffRampReader(lggr logger.Logger, versionFinder VersionFinder, addr ccip.Address, destClient client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int) error {
-	return factory.CloseOffRampReader(lggr, versionFinder, addr, destClient, lp, estimator, destMaxGasPrice)
+func CloseOffRampReader(lggr logger.Logger, versionFinder VersionFinder, addr ccip.Address, destClient client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) error {
+	return factory.CloseOffRampReader(lggr, versionFinder, addr, destClient, lp, estimator, destMaxGasPrice, feeEstimatorConfig)
 }
 
 func NewEvmVersionFinder() factory.EvmVersionFinder {
diff --git a/core/services/ocr2/plugins/ccip/internal/cache/commit_roots_test.go b/core/services/ocr2/plugins/ccip/internal/cache/commit_roots_test.go
index dc0a844349..d8289212e8 100644
--- a/core/services/ocr2/plugins/ccip/internal/cache/commit_roots_test.go
+++ b/core/services/ocr2/plugins/ccip/internal/cache/commit_roots_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
-
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
 	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
@@ -18,6 +17,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache"
+	ccipdatamocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0"
 )
 
@@ -54,7 +54,9 @@ func Test_RootsEligibleForExecution(t *testing.T) {
 	}
 	require.NoError(t, orm.InsertLogsWithBlock(ctx, inputLogs, logpoller.NewLogPollerBlock(utils.RandomBytes32(), 2, time.Now(), 1)))
 
-	commitStore, err := v1_2_0.NewCommitStore(logger.TestLogger(t), commitStoreAddr, nil, lp)
+	feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
+	commitStore, err := v1_2_0.NewCommitStore(logger.TestLogger(t), commitStoreAddr, nil, lp, feeEstimatorConfig)
 	require.NoError(t, err)
 
 	rootsCache := cache.NewCommitRootsCache(logger.TestLogger(t), commitStore, 10*time.Hour, time.Second)
@@ -162,7 +164,9 @@ func Test_RootsEligibleForExecutionWithReorgs(t *testing.T) {
 	}
 	require.NoError(t, orm.InsertLogsWithBlock(ctx, inputLogs, logpoller.NewLogPollerBlock(utils.RandomBytes32(), 3, time.Now(), 1)))
 
-	commitStore, err := v1_2_0.NewCommitStore(logger.TestLogger(t), commitStoreAddr, nil, lp)
+	feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
+	commitStore, err := v1_2_0.NewCommitStore(logger.TestLogger(t), commitStoreAddr, nil, lp, feeEstimatorConfig)
 	require.NoError(t, err)
 
 	rootsCache := cache.NewCommitRootsCache(logger.TestLogger(t), commitStore, 10*time.Hour, time.Second)
@@ -221,7 +225,9 @@ func Test_BlocksWithTheSameTimestamps(t *testing.T) {
 	}
 	require.NoError(t, orm.InsertLogsWithBlock(ctx, inputLogs, logpoller.NewLogPollerBlock(utils.RandomBytes32(), 2, time.Now(), 2)))
 
-	commitStore, err := v1_2_0.NewCommitStore(logger.TestLogger(t), commitStoreAddr, nil, lp)
+	feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
+	commitStore, err := v1_2_0.NewCommitStore(logger.TestLogger(t), commitStoreAddr, nil, lp, feeEstimatorConfig)
 	require.NoError(t, err)
 
 	rootsCache := cache.NewCommitRootsCache(logger.TestLogger(t), commitStore, 10*time.Hour, time.Second)
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/commit_store_reader_test.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/commit_store_reader_test.go
index 7f6b1c1bb7..6b075be50c 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/commit_store_reader_test.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/commit_store_reader_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/config"
-
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
@@ -38,6 +37,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipcalc"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/factory"
+	ccipdatamocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0"
 )
@@ -193,15 +193,17 @@ func TestCommitStoreReaders(t *testing.T) {
 	lm := new(rollupMocks.L1Oracle)
 	ge.On("L1Oracle").Return(lm)
 
+	feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
 	maxGasPrice := big.NewInt(1e8)
-	c10r, err := factory.NewCommitStoreReader(lggr, factory.NewEvmVersionFinder(), ccipcalc.EvmAddrToGeneric(addr), ec, lp) // ge, maxGasPrice
+	c10r, err := factory.NewCommitStoreReader(lggr, factory.NewEvmVersionFinder(), ccipcalc.EvmAddrToGeneric(addr), ec, lp, feeEstimatorConfig) // ge, maxGasPrice
 	require.NoError(t, err)
 	err = c10r.SetGasEstimator(ctx, ge)
 	require.NoError(t, err)
 	err = c10r.SetSourceMaxGasPrice(ctx, maxGasPrice)
 	require.NoError(t, err)
 	assert.Equal(t, reflect.TypeOf(c10r).String(), reflect.TypeOf(&v1_0_0.CommitStore{}).String())
-	c12r, err := factory.NewCommitStoreReader(lggr, factory.NewEvmVersionFinder(), ccipcalc.EvmAddrToGeneric(addr2), ec, lp)
+	c12r, err := factory.NewCommitStoreReader(lggr, factory.NewEvmVersionFinder(), ccipcalc.EvmAddrToGeneric(addr2), ec, lp, feeEstimatorConfig)
 	require.NoError(t, err)
 	err = c12r.SetGasEstimator(ctx, ge)
 	require.NoError(t, err)
@@ -412,7 +414,10 @@ func TestNewCommitStoreReader(t *testing.T) {
 			if tc.expectedErr == "" {
 				lp.On("RegisterFilter", mock.Anything, mock.Anything).Return(nil)
 			}
-			_, err = factory.NewCommitStoreReader(logger.TestLogger(t), factory.NewEvmVersionFinder(), addr, c, lp)
+
+			feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
+			_, err = factory.NewCommitStoreReader(logger.TestLogger(t), factory.NewEvmVersionFinder(), addr, c, lp, feeEstimatorConfig)
 			if tc.expectedErr != "" {
 				require.EqualError(t, err, tc.expectedErr)
 			} else {
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/commit_store.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/commit_store.go
index d431d2863a..c5f32ba91c 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/commit_store.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/commit_store.go
@@ -21,16 +21,16 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0"
 )
 
-func NewCommitStoreReader(lggr logger.Logger, versionFinder VersionFinder, address cciptypes.Address, ec client.Client, lp logpoller.LogPoller) (ccipdata.CommitStoreReader, error) {
-	return initOrCloseCommitStoreReader(lggr, versionFinder, address, ec, lp, false)
+func NewCommitStoreReader(lggr logger.Logger, versionFinder VersionFinder, address cciptypes.Address, ec client.Client, lp logpoller.LogPoller, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) (ccipdata.CommitStoreReader, error) {
+	return initOrCloseCommitStoreReader(lggr, versionFinder, address, ec, lp, feeEstimatorConfig, false)
 }
 
-func CloseCommitStoreReader(lggr logger.Logger, versionFinder VersionFinder, address cciptypes.Address, ec client.Client, lp logpoller.LogPoller) error {
-	_, err := initOrCloseCommitStoreReader(lggr, versionFinder, address, ec, lp, true)
+func CloseCommitStoreReader(lggr logger.Logger, versionFinder VersionFinder, address cciptypes.Address, ec client.Client, lp logpoller.LogPoller, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) error {
+	_, err := initOrCloseCommitStoreReader(lggr, versionFinder, address, ec, lp, feeEstimatorConfig, true)
 	return err
 }
 
-func initOrCloseCommitStoreReader(lggr logger.Logger, versionFinder VersionFinder, address cciptypes.Address, ec client.Client, lp logpoller.LogPoller, closeReader bool) (ccipdata.CommitStoreReader, error) {
+func initOrCloseCommitStoreReader(lggr logger.Logger, versionFinder VersionFinder, address cciptypes.Address, ec client.Client, lp logpoller.LogPoller, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader, closeReader bool) (ccipdata.CommitStoreReader, error) {
 	contractType, version, err := versionFinder.TypeAndVersion(address, ec)
 	if err != nil {
 		return nil, errors.Wrapf(err, "unable to read type and version")
@@ -57,7 +57,7 @@ func initOrCloseCommitStoreReader(lggr logger.Logger, versionFinder VersionFinde
 		}
 		return cs, cs.RegisterFilters()
 	case ccipdata.V1_2_0:
-		cs, err := v1_2_0.NewCommitStore(lggr, evmAddr, ec, lp)
+		cs, err := v1_2_0.NewCommitStore(lggr, evmAddr, ec, lp, feeEstimatorConfig)
 		if err != nil {
 			return nil, err
 		}
@@ -66,7 +66,7 @@ func initOrCloseCommitStoreReader(lggr logger.Logger, versionFinder VersionFinde
 		}
 		return cs, cs.RegisterFilters()
 	case ccipdata.V1_5_0:
-		cs, err := v1_5_0.NewCommitStore(lggr, evmAddr, ec, lp)
+		cs, err := v1_5_0.NewCommitStore(lggr, evmAddr, ec, lp, feeEstimatorConfig)
 		if err != nil {
 			return nil, err
 		}
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/commit_store_test.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/commit_store_test.go
index e1b8ff929c..987b6f848e 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/commit_store_test.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/commit_store_test.go
@@ -8,13 +8,13 @@ import (
 	"github.com/stretchr/testify/mock"
 
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
-
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	mocks2 "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	ccipconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/config"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata"
+	ccipdatamocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0"
 )
 
@@ -24,14 +24,16 @@ func TestCommitStore(t *testing.T) {
 		addr := cciptypes.Address(utils.RandomAddress().String())
 		lp := mocks2.NewLogPoller(t)
 
+		feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
 		lp.On("RegisterFilter", mock.Anything, mock.Anything).Return(nil)
 		versionFinder := newMockVersionFinder(ccipconfig.CommitStore, *semver.MustParse(versionStr), nil)
-		_, err := NewCommitStoreReader(lggr, versionFinder, addr, nil, lp)
+		_, err := NewCommitStoreReader(lggr, versionFinder, addr, nil, lp, feeEstimatorConfig)
 		assert.NoError(t, err)
 
 		expFilterName := logpoller.FilterName(v1_0_0.EXEC_REPORT_ACCEPTS, addr)
 		lp.On("UnregisterFilter", mock.Anything, expFilterName).Return(nil)
-		err = CloseCommitStoreReader(lggr, versionFinder, addr, nil, lp)
+		err = CloseCommitStoreReader(lggr, versionFinder, addr, nil, lp, feeEstimatorConfig)
 		assert.NoError(t, err)
 	}
 }
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/offramp.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/offramp.go
index c6fa63ee82..5d9b751d0b 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/offramp.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/offramp.go
@@ -26,16 +26,16 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0"
 )
 
-func NewOffRampReader(lggr logger.Logger, versionFinder VersionFinder, addr cciptypes.Address, destClient client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int, registerFilters bool) (ccipdata.OffRampReader, error) {
-	return initOrCloseOffRampReader(lggr, versionFinder, addr, destClient, lp, estimator, destMaxGasPrice, false, registerFilters)
+func NewOffRampReader(lggr logger.Logger, versionFinder VersionFinder, addr cciptypes.Address, destClient client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int, registerFilters bool, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) (ccipdata.OffRampReader, error) {
+	return initOrCloseOffRampReader(lggr, versionFinder, addr, destClient, lp, estimator, destMaxGasPrice, false, registerFilters, feeEstimatorConfig)
 }
 
-func CloseOffRampReader(lggr logger.Logger, versionFinder VersionFinder, addr cciptypes.Address, destClient client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int) error {
-	_, err := initOrCloseOffRampReader(lggr, versionFinder, addr, destClient, lp, estimator, destMaxGasPrice, true, false)
+func CloseOffRampReader(lggr logger.Logger, versionFinder VersionFinder, addr cciptypes.Address, destClient client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) error {
+	_, err := initOrCloseOffRampReader(lggr, versionFinder, addr, destClient, lp, estimator, destMaxGasPrice, true, false, feeEstimatorConfig)
 	return err
 }
 
-func initOrCloseOffRampReader(lggr logger.Logger, versionFinder VersionFinder, addr cciptypes.Address, destClient client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int, closeReader bool, registerFilters bool) (ccipdata.OffRampReader, error) {
+func initOrCloseOffRampReader(lggr logger.Logger, versionFinder VersionFinder, addr cciptypes.Address, destClient client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int, closeReader bool, registerFilters bool, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) (ccipdata.OffRampReader, error) {
 	contractType, version, err := versionFinder.TypeAndVersion(addr, destClient)
 	if err != nil {
 		return nil, errors.Wrapf(err, "unable to read type and version")
@@ -53,7 +53,7 @@ func initOrCloseOffRampReader(lggr logger.Logger, versionFinder VersionFinder, a
 
 	switch version.String() {
 	case ccipdata.V1_0_0, ccipdata.V1_1_0:
-		offRamp, err := v1_0_0.NewOffRamp(lggr, evmAddr, destClient, lp, estimator, destMaxGasPrice)
+		offRamp, err := v1_0_0.NewOffRamp(lggr, evmAddr, destClient, lp, estimator, destMaxGasPrice, feeEstimatorConfig)
 		if err != nil {
 			return nil, err
 		}
@@ -62,7 +62,7 @@ func initOrCloseOffRampReader(lggr logger.Logger, versionFinder VersionFinder, a
 		}
 		return offRamp, offRamp.RegisterFilters()
 	case ccipdata.V1_2_0:
-		offRamp, err := v1_2_0.NewOffRamp(lggr, evmAddr, destClient, lp, estimator, destMaxGasPrice)
+		offRamp, err := v1_2_0.NewOffRamp(lggr, evmAddr, destClient, lp, estimator, destMaxGasPrice, feeEstimatorConfig)
 		if err != nil {
 			return nil, err
 		}
@@ -71,7 +71,7 @@ func initOrCloseOffRampReader(lggr logger.Logger, versionFinder VersionFinder, a
 		}
 		return offRamp, offRamp.RegisterFilters()
 	case ccipdata.V1_5_0:
-		offRamp, err := v1_5_0.NewOffRamp(lggr, evmAddr, destClient, lp, estimator, destMaxGasPrice)
+		offRamp, err := v1_5_0.NewOffRamp(lggr, evmAddr, destClient, lp, estimator, destMaxGasPrice, feeEstimatorConfig)
 		if err != nil {
 			return nil, err
 		}
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/offramp_test.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/offramp_test.go
index 4b9e57ecfb..c00d9e134b 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/offramp_test.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/factory/offramp_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	ccipconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/config"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata"
+	ccipdatamocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0"
 )
 
@@ -24,6 +25,8 @@ func TestOffRamp(t *testing.T) {
 		addr := cciptypes.Address(utils.RandomAddress().String())
 		lp := mocks2.NewLogPoller(t)
 
+		feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
 		expFilterNames := []string{
 			logpoller.FilterName(v1_0_0.EXEC_EXECUTION_STATE_CHANGES, addr),
 			logpoller.FilterName(v1_0_0.EXEC_TOKEN_POOL_ADDED, addr),
@@ -32,13 +35,13 @@ func TestOffRamp(t *testing.T) {
 		versionFinder := newMockVersionFinder(ccipconfig.EVM2EVMOffRamp, *semver.MustParse(versionStr), nil)
 
 		lp.On("RegisterFilter", mock.Anything, mock.Anything).Return(nil).Times(len(expFilterNames))
-		_, err := NewOffRampReader(lggr, versionFinder, addr, nil, lp, nil, nil, true)
+		_, err := NewOffRampReader(lggr, versionFinder, addr, nil, lp, nil, nil, true, feeEstimatorConfig)
 		assert.NoError(t, err)
 
 		for _, f := range expFilterNames {
 			lp.On("UnregisterFilter", mock.Anything, f).Return(nil)
 		}
-		err = CloseOffRampReader(lggr, versionFinder, addr, nil, lp, nil, nil)
+		err = CloseOffRampReader(lggr, versionFinder, addr, nil, lp, nil, nil, feeEstimatorConfig)
 		assert.NoError(t, err)
 	}
 }
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/fee_estimator_config.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/fee_estimator_config.go
new file mode 100644
index 0000000000..a1a9370528
--- /dev/null
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/fee_estimator_config.go
@@ -0,0 +1,9 @@
+package ccipdata
+
+import (
+	"context"
+)
+
+type FeeEstimatorConfigReader interface {
+	GetDataAvailabilityConfig(ctx context.Context) (destDAOverheadGas, destGasPerDAByte, destDAMultiplierBps int64, err error)
+}
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/fee_estimator_config_mock.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/fee_estimator_config_mock.go
new file mode 100644
index 0000000000..b19f4cd882
--- /dev/null
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/fee_estimator_config_mock.go
@@ -0,0 +1,106 @@
+// Code generated by mockery v2.43.2. DO NOT EDIT.
+
+package mocks
+
+import (
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// FeeEstimatorConfigReader is an autogenerated mock type for the FeeEstimatorConfigReader type
+type FeeEstimatorConfigReader struct {
+	mock.Mock
+}
+
+type FeeEstimatorConfigReader_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *FeeEstimatorConfigReader) EXPECT() *FeeEstimatorConfigReader_Expecter {
+	return &FeeEstimatorConfigReader_Expecter{mock: &_m.Mock}
+}
+
+// GetDataAvailabilityConfig provides a mock function with given fields: ctx
+func (_m *FeeEstimatorConfigReader) GetDataAvailabilityConfig(ctx context.Context) (int64, int64, int64, error) {
+	ret := _m.Called(ctx)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetDataAvailabilityConfig")
+	}
+
+	var r0 int64
+	var r1 int64
+	var r2 int64
+	var r3 error
+	if rf, ok := ret.Get(0).(func(context.Context) (int64, int64, int64, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) int64); ok {
+		r0 = rf(ctx)
+	} else {
+		r0 = ret.Get(0).(int64)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) int64); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Get(1).(int64)
+	}
+
+	if rf, ok := ret.Get(2).(func(context.Context) int64); ok {
+		r2 = rf(ctx)
+	} else {
+		r2 = ret.Get(2).(int64)
+	}
+
+	if rf, ok := ret.Get(3).(func(context.Context) error); ok {
+		r3 = rf(ctx)
+	} else {
+		r3 = ret.Error(3)
+	}
+
+	return r0, r1, r2, r3
+}
+
+// FeeEstimatorConfigReader_GetDataAvailabilityConfig_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDataAvailabilityConfig'
+type FeeEstimatorConfigReader_GetDataAvailabilityConfig_Call struct {
+	*mock.Call
+}
+
+// GetDataAvailabilityConfig is a helper method to define mock.On call
+//   - ctx context.Context
+func (_e *FeeEstimatorConfigReader_Expecter) GetDataAvailabilityConfig(ctx interface{}) *FeeEstimatorConfigReader_GetDataAvailabilityConfig_Call {
+	return &FeeEstimatorConfigReader_GetDataAvailabilityConfig_Call{Call: _e.mock.On("GetDataAvailabilityConfig", ctx)}
+}
+
+func (_c *FeeEstimatorConfigReader_GetDataAvailabilityConfig_Call) Run(run func(ctx context.Context)) *FeeEstimatorConfigReader_GetDataAvailabilityConfig_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context))
+	})
+	return _c
+}
+
+func (_c *FeeEstimatorConfigReader_GetDataAvailabilityConfig_Call) Return(destDAOverheadGas int64, destGasPerDAByte int64, destDAMultiplierBps int64, err error) *FeeEstimatorConfigReader_GetDataAvailabilityConfig_Call {
+	_c.Call.Return(destDAOverheadGas, destGasPerDAByte, destDAMultiplierBps, err)
+	return _c
+}
+
+func (_c *FeeEstimatorConfigReader_GetDataAvailabilityConfig_Call) RunAndReturn(run func(context.Context) (int64, int64, int64, error)) *FeeEstimatorConfigReader_GetDataAvailabilityConfig_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// NewFeeEstimatorConfigReader creates a new instance of FeeEstimatorConfigReader. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewFeeEstimatorConfigReader(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *FeeEstimatorConfigReader {
+	mock := &FeeEstimatorConfigReader{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/offramp_reader_test.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/offramp_reader_test.go
index f5711422bd..df405a5a61 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/offramp_reader_test.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/offramp_reader_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
-
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclientmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
@@ -32,6 +31,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipcalc"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/factory"
+	ccipdatamocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0"
 )
@@ -194,8 +194,10 @@ func setupOffRampReaderTH(t *testing.T, version string) offRampReaderTH {
 		require.Fail(t, "Unknown version: ", version)
 	}
 
+	feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
 	// Create the version-specific reader.
-	reader, err := factory.NewOffRampReader(log, factory.NewEvmVersionFinder(), ccipcalc.EvmAddrToGeneric(offRampAddress), bc, lp, nil, nil, true)
+	reader, err := factory.NewOffRampReader(log, factory.NewEvmVersionFinder(), ccipcalc.EvmAddrToGeneric(offRampAddress), bc, lp, nil, nil, true, feeEstimatorConfig)
 	require.NoError(t, err)
 	addr, err := reader.Address(ctx)
 	require.NoError(t, err)
@@ -401,11 +403,14 @@ func TestNewOffRampReader(t *testing.T) {
 			b, err := utils.ABIEncode(`[{"type":"string"}]`, tc.typeAndVersion)
 			require.NoError(t, err)
 			c := evmclientmocks.NewClient(t)
+
+			feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
 			c.On("CallContract", mock.Anything, mock.Anything, mock.Anything).Return(b, nil)
 			addr := ccipcalc.EvmAddrToGeneric(utils.RandomAddress())
 			lp := lpmocks.NewLogPoller(t)
 			lp.On("RegisterFilter", mock.Anything, mock.Anything).Return(nil).Maybe()
-			_, err = factory.NewOffRampReader(logger.TestLogger(t), factory.NewEvmVersionFinder(), addr, c, lp, nil, nil, true)
+			_, err = factory.NewOffRampReader(logger.TestLogger(t), factory.NewEvmVersionFinder(), addr, c, lp, nil, nil, true, feeEstimatorConfig)
 			if tc.expectedErr != "" {
 				assert.EqualError(t, err, tc.expectedErr)
 			} else {
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp.go
index 137cbaf451..b5625c59d0 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp.go
@@ -156,6 +156,7 @@ type OffRamp struct {
 	eventSig                common.Hash
 	cachedOffRampTokens     cache.AutoSync[cciptypes.OffRampTokens]
 	sourceToDestTokensCache sync.Map
+	feeEstimatorConfig      ccipdata.FeeEstimatorConfigReader
 
 	// Dynamic config
 	// configMu guards all the dynamic config fields.
@@ -627,7 +628,7 @@ func (o *OffRamp) RegisterFilters() error {
 	return logpollerutil.RegisterLpFilters(o.lp, o.filters)
 }
 
-func NewOffRamp(lggr logger.Logger, addr common.Address, ec client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int) (*OffRamp, error) {
+func NewOffRamp(lggr logger.Logger, addr common.Address, ec client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) (*OffRamp, error) {
 	offRamp, err := evm_2_evm_offramp_1_0_0.NewEVM2EVMOffRamp(addr, ec)
 	if err != nil {
 		return nil, err
@@ -682,8 +683,9 @@ func NewOffRamp(lggr logger.Logger, addr common.Address, ec client.Client, lp lo
 			offRamp.Address(),
 		),
 		// values set on the fly after ChangeConfig is called
-		gasPriceEstimator: prices.ExecGasPriceEstimator{},
-		offchainConfig:    cciptypes.ExecOffchainConfig{},
-		onchainConfig:     cciptypes.ExecOnchainConfig{},
+		gasPriceEstimator:  prices.ExecGasPriceEstimator{},
+		offchainConfig:     cciptypes.ExecOffchainConfig{},
+		onchainConfig:      cciptypes.ExecOnchainConfig{},
+		feeEstimatorConfig: feeEstimatorConfig,
 	}, nil
 }
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp_reader_test.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp_reader_test.go
index d834b792ce..455c1dbcb8 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp_reader_test.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp_reader_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0"
 )
 
@@ -25,7 +26,9 @@ func TestExecutionReportEncodingV100(t *testing.T) {
 		ProofFlagBits:     big.NewInt(133),
 	}
 
-	offRamp, err := v1_0_0.NewOffRamp(logger.TestLogger(t), utils.RandomAddress(), nil, lpmocks.NewLogPoller(t), nil, nil)
+	feeEstimatorConfig := mocks.NewFeeEstimatorConfigReader(t)
+
+	offRamp, err := v1_0_0.NewOffRamp(logger.TestLogger(t), utils.RandomAddress(), nil, lpmocks.NewLogPoller(t), nil, nil, feeEstimatorConfig)
 	require.NoError(t, err)
 
 	ctx := testutils.Context(t)
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp_reader_unit_test.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp_reader_unit_test.go
index f8b1dc4e61..6cde3753b7 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp_reader_unit_test.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp_reader_unit_test.go
@@ -6,16 +6,12 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/rpclib"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/rpclib/rpclibmocks"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
-
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
@@ -27,6 +23,9 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipcalc"
+	ccipdatamocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/rpclib"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/rpclib/rpclibmocks"
 )
 
 func TestOffRampGetDestinationTokensFromSourceTokens(t *testing.T) {
@@ -190,13 +189,15 @@ func Test_LogsAreProperlyMarkedAsFinalized(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			offrampAddress := utils.RandomAddress()
 
+			feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
 			lp := mocks.NewLogPoller(t)
 			lp.On("LatestBlock", mock.Anything).
 				Return(logpoller.LogPollerBlock{FinalizedBlockNumber: int64(tt.lastFinalizedBlock)}, nil)
 			lp.On("IndexedLogsTopicRange", mock.Anything, ExecutionStateChangedEvent, offrampAddress, 1, logpoller.EvmWord(minSeqNr), logpoller.EvmWord(maxSeqNr), evmtypes.Confirmations(0)).
 				Return(inputLogs, nil)
 
-			offRamp, err := NewOffRamp(logger.TestLogger(t), offrampAddress, evmclimocks.NewClient(t), lp, nil, nil)
+			offRamp, err := NewOffRamp(logger.TestLogger(t), offrampAddress, evmclimocks.NewClient(t), lp, nil, nil, feeEstimatorConfig)
 			require.NoError(t, err)
 			logs, err := offRamp.GetExecutionStateChangesBetweenSeqNums(testutils.Context(t), minSeqNr, maxSeqNr, 0)
 			require.NoError(t, err)
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/onramp.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/onramp.go
index 6737abe64c..d6f3094af7 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/onramp.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/onramp.go
@@ -30,16 +30,16 @@ const (
 var _ ccipdata.OnRampReader = &OnRamp{}
 
 type OnRamp struct {
-	address                          common.Address
-	onRamp                           *evm_2_evm_onramp_1_0_0.EVM2EVMOnRamp
-	lp                               logpoller.LogPoller
-	lggr                             logger.Logger
-	client                           client.Client
-	leafHasher                       ccipdata.LeafHasherInterface[[32]byte]
-	sendRequestedEventSig            common.Hash
-	sendRequestedSeqNumberWord       int
-	filters                          []logpoller.Filter
-	cachedSourcePriceRegistryAddress cache.AutoSync[cciptypes.Address]
+	address                    common.Address
+	onRamp                     *evm_2_evm_onramp_1_0_0.EVM2EVMOnRamp
+	lp                         logpoller.LogPoller
+	lggr                       logger.Logger
+	client                     client.Client
+	leafHasher                 ccipdata.LeafHasherInterface[[32]byte]
+	sendRequestedEventSig      common.Hash
+	sendRequestedSeqNumberWord int
+	filters                    []logpoller.Filter
+	cachedOnRampDynamicConfig  cache.AutoSync[cciptypes.OnRampDynamicConfig]
 	// Static config can be cached, because it's never expected to change.
 	// The only way to change that is through the contract's constructor (redeployment)
 	cachedStaticConfig cache.OnceCtxFunction[evm_2_evm_onramp_1_0_0.EVM2EVMOnRampStaticConfig]
@@ -90,7 +90,7 @@ func NewOnRamp(lggr logger.Logger, sourceSelector, destSelector uint64, onRampAd
 		// offset || sourceChainID || seqNum || ...
 		sendRequestedSeqNumberWord: 2,
 		sendRequestedEventSig:      eventSig,
-		cachedSourcePriceRegistryAddress: cache.NewLogpollerEventsBased[cciptypes.Address](
+		cachedOnRampDynamicConfig: cache.NewLogpollerEventsBased[cciptypes.OnRampDynamicConfig](
 			sourceLP,
 			[]common.Hash{configSetEventSig},
 			onRampAddress,
@@ -104,38 +104,38 @@ func (o *OnRamp) Address(context.Context) (cciptypes.Address, error) {
 	return cciptypes.Address(o.onRamp.Address().String()), nil
 }
 
-func (o *OnRamp) GetDynamicConfig(context.Context) (cciptypes.OnRampDynamicConfig, error) {
-	if o.onRamp == nil {
-		return cciptypes.OnRampDynamicConfig{}, fmt.Errorf("onramp not initialized")
-	}
-	legacyDynamicConfig, err := o.onRamp.GetDynamicConfig(nil)
-	if err != nil {
-		return cciptypes.OnRampDynamicConfig{}, err
-	}
-	return cciptypes.OnRampDynamicConfig{
-		Router:                            cciptypes.Address(legacyDynamicConfig.Router.String()),
-		MaxNumberOfTokensPerMsg:           legacyDynamicConfig.MaxTokensLength,
-		DestGasOverhead:                   0,
-		DestGasPerPayloadByte:             0,
-		DestDataAvailabilityOverheadGas:   0,
-		DestGasPerDataAvailabilityByte:    0,
-		DestDataAvailabilityMultiplierBps: 0,
-		PriceRegistry:                     cciptypes.Address(legacyDynamicConfig.PriceRegistry.String()),
-		MaxDataBytes:                      legacyDynamicConfig.MaxDataSize,
-		MaxPerMsgGasLimit:                 uint32(legacyDynamicConfig.MaxGasLimit),
-	}, nil
-}
-
-func (o *OnRamp) SourcePriceRegistryAddress(ctx context.Context) (cciptypes.Address, error) {
-	return o.cachedSourcePriceRegistryAddress.Get(ctx, func(ctx context.Context) (cciptypes.Address, error) {
-		c, err := o.GetDynamicConfig(ctx)
+func (o *OnRamp) GetDynamicConfig(ctx context.Context) (cciptypes.OnRampDynamicConfig, error) {
+	return o.cachedOnRampDynamicConfig.Get(ctx, func(ctx context.Context) (cciptypes.OnRampDynamicConfig, error) {
+		if o.onRamp == nil {
+			return cciptypes.OnRampDynamicConfig{}, fmt.Errorf("onramp not initialized")
+		}
+		legacyDynamicConfig, err := o.onRamp.GetDynamicConfig(&bind.CallOpts{Context: ctx})
 		if err != nil {
-			return "", err
+			return cciptypes.OnRampDynamicConfig{}, err
 		}
-		return c.PriceRegistry, nil
+		return cciptypes.OnRampDynamicConfig{
+			Router:                            cciptypes.Address(legacyDynamicConfig.Router.String()),
+			MaxNumberOfTokensPerMsg:           legacyDynamicConfig.MaxTokensLength,
+			DestGasOverhead:                   0,
+			DestGasPerPayloadByte:             0,
+			DestDataAvailabilityOverheadGas:   0,
+			DestGasPerDataAvailabilityByte:    0,
+			DestDataAvailabilityMultiplierBps: 0,
+			PriceRegistry:                     cciptypes.Address(legacyDynamicConfig.PriceRegistry.String()),
+			MaxDataBytes:                      legacyDynamicConfig.MaxDataSize,
+			MaxPerMsgGasLimit:                 uint32(legacyDynamicConfig.MaxGasLimit),
+		}, nil
 	})
 }
 
+func (o *OnRamp) SourcePriceRegistryAddress(ctx context.Context) (cciptypes.Address, error) {
+	c, err := o.GetDynamicConfig(ctx)
+	if err != nil {
+		return "", err
+	}
+	return c.PriceRegistry, nil
+}
+
 func (o *OnRamp) GetSendRequestsBetweenSeqNums(ctx context.Context, seqNumMin, seqNumMax uint64, finalized bool) ([]cciptypes.EVM2EVMMessageWithTxMeta, error) {
 	logs, err := o.lp.LogsDataWordRange(
 		ctx,
@@ -165,8 +165,8 @@ func (o *OnRamp) GetSendRequestsBetweenSeqNums(ctx context.Context, seqNumMin, s
 	return res, nil
 }
 
-func (o *OnRamp) RouterAddress(context.Context) (cciptypes.Address, error) {
-	config, err := o.onRamp.GetDynamicConfig(nil)
+func (o *OnRamp) RouterAddress(ctx context.Context) (cciptypes.Address, error) {
+	config, err := o.onRamp.GetDynamicConfig(&bind.CallOpts{Context: ctx})
 	if err != nil {
 		return "", err
 	}
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/commit_store.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/commit_store.go
index a8e3c8dadd..39dc91bde5 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/commit_store.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/commit_store.go
@@ -49,9 +49,10 @@ type CommitStore struct {
 	commitReportArgs          abi.Arguments
 
 	// Dynamic config
-	configMu          sync.RWMutex
-	gasPriceEstimator *prices.DAGasPriceEstimator
-	offchainConfig    cciptypes.CommitOffchainConfig
+	configMu           sync.RWMutex
+	gasPriceEstimator  *prices.DAGasPriceEstimator
+	offchainConfig     cciptypes.CommitOffchainConfig
+	feeEstimatorConfig ccipdata.FeeEstimatorConfigReader
 }
 
 func (c *CommitStore) GetCommitStoreStaticConfig(ctx context.Context) (cciptypes.CommitStoreStaticConfig, error) {
@@ -255,6 +256,7 @@ func (c *CommitStore) ChangeConfig(_ context.Context, onchainConfig []byte, offc
 		c.sourceMaxGasPrice,
 		int64(offchainConfigParsed.ExecGasPriceDeviationPPB),
 		int64(offchainConfigParsed.DAGasPriceDeviationPPB),
+		c.feeEstimatorConfig,
 	)
 	c.offchainConfig = ccipdata.NewCommitOffchainConfig(
 		offchainConfigParsed.ExecGasPriceDeviationPPB,
@@ -431,7 +433,7 @@ func (c *CommitStore) RegisterFilters() error {
 	return logpollerutil.RegisterLpFilters(c.lp, c.filters)
 }
 
-func NewCommitStore(lggr logger.Logger, addr common.Address, ec client.Client, lp logpoller.LogPoller) (*CommitStore, error) {
+func NewCommitStore(lggr logger.Logger, addr common.Address, ec client.Client, lp logpoller.LogPoller, feeEstimatorConfig ccipdata.FeeEstimatorConfigReader) (*CommitStore, error) {
 	commitStore, err := commit_store_1_2_0.NewCommitStore(addr, ec)
 	if err != nil {
 		return nil, err
@@ -464,7 +466,8 @@ func NewCommitStore(lggr logger.Logger, addr common.Address, ec client.Client, l
 		configMu:                  sync.RWMutex{},
 
 		// The fields below are initially empty and set on ChangeConfig method
-		offchainConfig:    cciptypes.CommitOffchainConfig{},
-		gasPriceEstimator: nil,
+		offchainConfig:     cciptypes.CommitOffchainConfig{},
+		gasPriceEstimator:  nil,
+		feeEstimatorConfig: feeEstimatorConfig,
 	}, nil
 }
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/commit_store_test.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/commit_store_test.go
index 8b29309633..4307be0353 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/commit_store_test.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/commit_store_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/config"
-
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
@@ -18,6 +17,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	ccipconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/config"
+	ccipdatamocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
 )
 
 func TestCommitReportEncoding(t *testing.T) {
@@ -48,7 +48,9 @@ func TestCommitReportEncoding(t *testing.T) {
 		Interval:   cciptypes.CommitStoreInterval{Min: 1, Max: 10},
 	}
 
-	c, err := NewCommitStore(logger.TestLogger(t), utils.RandomAddress(), nil, mocks.NewLogPoller(t))
+	feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+
+	c, err := NewCommitStore(logger.TestLogger(t), utils.RandomAddress(), nil, mocks.NewLogPoller(t), feeEstimatorConfig)
 	assert.NoError(t, err)
 
 	encodedReport, err := c.EncodeCommitReport(ctx, report)
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/offramp.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/offramp.go
index fa00894b38..f853adfb6f 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/offramp.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/offramp.go
@@ -123,7 +123,8 @@ func (c JSONExecOffchainConfig) Validate() error {
 // OffRamp In 1.2 we have a different estimator impl
 type OffRamp struct {
 	*v1_0_0.OffRamp
-	offRampV120 evm_2_evm_offramp_1_2_0.EVM2EVMOffRampInterface
+	offRampV120        evm_2_evm_offramp_1_2_0.EVM2EVMOffRampInterface
+	feeEstimatorConfig ccipdata.FeeEstimatorConfigReader
 }
 
 func (o *OffRamp) CurrentRateLimiterState(ctx context.Context) (cciptypes.TokenBucketRateLimit, error) {
@@ -180,7 +181,7 @@ func (o *OffRamp) ChangeConfig(ctx context.Context, onchainConfigBytes []byte, o
 		PermissionLessExecutionThresholdSeconds: time.Second * time.Duration(onchainConfigParsed.PermissionLessExecutionThresholdSeconds),
 		Router:                                  cciptypes.Address(onchainConfigParsed.Router.String()),
 	}
-	priceEstimator := prices.NewDAGasPriceEstimator(o.Estimator, o.DestMaxGasPrice, 0, 0)
+	priceEstimator := prices.NewDAGasPriceEstimator(o.Estimator, o.DestMaxGasPrice, 0, 0, o.feeEstimatorConfig)
 
 	o.UpdateDynamicConfig(onchainConfig, offchainConfig, priceEstimator)
 
@@ -320,8 +321,16 @@ func (o *OffRamp) DecodeExecutionReport(ctx context.Context, report []byte) (cci
 	return DecodeExecReport(ctx, o.ExecutionReportArgs, report)
 }
 
-func NewOffRamp(lggr logger.Logger, addr common.Address, ec client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int) (*OffRamp, error) {
-	v100, err := v1_0_0.NewOffRamp(lggr, addr, ec, lp, estimator, destMaxGasPrice)
+func NewOffRamp(
+	lggr logger.Logger,
+	addr common.Address,
+	ec client.Client,
+	lp logpoller.LogPoller,
+	estimator gas.EvmFeeEstimator,
+	destMaxGasPrice *big.Int,
+	feeEstimatorConfig ccipdata.FeeEstimatorConfigReader,
+) (*OffRamp, error) {
+	v100, err := v1_0_0.NewOffRamp(lggr, addr, ec, lp, estimator, destMaxGasPrice, feeEstimatorConfig)
 	if err != nil {
 		return nil, err
 	}
@@ -334,7 +343,8 @@ func NewOffRamp(lggr logger.Logger, addr common.Address, ec client.Client, lp lo
 	v100.ExecutionReportArgs = abihelpers.MustGetMethodInputs("manuallyExecute", abiOffRamp)[:1]
 
 	return &OffRamp{
-		OffRamp:     v100,
-		offRampV120: offRamp,
+		OffRamp:            v100,
+		offRampV120:        offRamp,
+		feeEstimatorConfig: feeEstimatorConfig,
 	}, nil
 }
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/offramp_reader_test.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/offramp_reader_test.go
index f87fc8842f..c298349261 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/offramp_reader_test.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/offramp_reader_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0"
 )
 
@@ -25,7 +26,9 @@ func TestExecutionReportEncodingV120(t *testing.T) {
 		ProofFlagBits:     big.NewInt(133),
 	}
 
-	offRamp, err := v1_2_0.NewOffRamp(logger.TestLogger(t), utils.RandomAddress(), nil, lpmocks.NewLogPoller(t), nil, nil)
+	feeEstimatorConfig := mocks.NewFeeEstimatorConfigReader(t)
+
+	offRamp, err := v1_2_0.NewOffRamp(logger.TestLogger(t), utils.RandomAddress(), nil, lpmocks.NewLogPoller(t), nil, nil, feeEstimatorConfig)
 	require.NoError(t, err)
 
 	ctx := testutils.Context(t)
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/onramp.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/onramp.go
index 2939682347..2de2b104c9 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/onramp.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/onramp.go
@@ -49,16 +49,16 @@ var _ ccipdata.OnRampReader = &OnRamp{}
 // Significant change in 1.2:
 // - CCIPSendRequested event signature has changed
 type OnRamp struct {
-	onRamp                           *evm_2_evm_onramp_1_2_0.EVM2EVMOnRamp
-	address                          common.Address
-	lggr                             logger.Logger
-	lp                               logpoller.LogPoller
-	leafHasher                       ccipdata.LeafHasherInterface[[32]byte]
-	client                           client.Client
-	sendRequestedEventSig            common.Hash
-	sendRequestedSeqNumberWord       int
-	filters                          []logpoller.Filter
-	cachedSourcePriceRegistryAddress cache.AutoSync[cciptypes.Address]
+	onRamp                     *evm_2_evm_onramp_1_2_0.EVM2EVMOnRamp
+	address                    common.Address
+	lggr                       logger.Logger
+	lp                         logpoller.LogPoller
+	leafHasher                 ccipdata.LeafHasherInterface[[32]byte]
+	client                     client.Client
+	sendRequestedEventSig      common.Hash
+	sendRequestedSeqNumberWord int
+	filters                    []logpoller.Filter
+	cachedOnRampDynamicConfig  cache.AutoSync[cciptypes.OnRampDynamicConfig]
 	// Static config can be cached, because it's never expected to change.
 	// The only way to change that is through the contract's constructor (redeployment)
 	cachedStaticConfig cache.OnceCtxFunction[evm_2_evm_onramp_1_2_0.EVM2EVMOnRampStaticConfig]
@@ -107,7 +107,7 @@ func NewOnRamp(lggr logger.Logger, sourceSelector, destSelector uint64, onRampAd
 		address:                    onRampAddress,
 		sendRequestedSeqNumberWord: CCIPSendRequestSeqNumIndex,
 		sendRequestedEventSig:      CCIPSendRequestEventSig,
-		cachedSourcePriceRegistryAddress: cache.NewLogpollerEventsBased[cciptypes.Address](
+		cachedOnRampDynamicConfig: cache.NewLogpollerEventsBased[cciptypes.OnRampDynamicConfig](
 			sourceLP,
 			[]common.Hash{ConfigSetEventSig},
 			onRampAddress,
@@ -121,38 +121,39 @@ func (o *OnRamp) Address(context.Context) (cciptypes.Address, error) {
 	return cciptypes.Address(o.onRamp.Address().String()), nil
 }
 
-func (o *OnRamp) GetDynamicConfig(context.Context) (cciptypes.OnRampDynamicConfig, error) {
-	if o.onRamp == nil {
-		return cciptypes.OnRampDynamicConfig{}, fmt.Errorf("onramp not initialized")
-	}
-	config, err := o.onRamp.GetDynamicConfig(&bind.CallOpts{})
-	if err != nil {
-		return cciptypes.OnRampDynamicConfig{}, fmt.Errorf("get dynamic config v1.2: %w", err)
-	}
-	return cciptypes.OnRampDynamicConfig{
-		Router:                            cciptypes.Address(config.Router.String()),
-		MaxNumberOfTokensPerMsg:           config.MaxNumberOfTokensPerMsg,
-		DestGasOverhead:                   config.DestGasOverhead,
-		DestGasPerPayloadByte:             config.DestGasPerPayloadByte,
-		DestDataAvailabilityOverheadGas:   config.DestDataAvailabilityOverheadGas,
-		DestGasPerDataAvailabilityByte:    config.DestGasPerDataAvailabilityByte,
-		DestDataAvailabilityMultiplierBps: config.DestDataAvailabilityMultiplierBps,
-		PriceRegistry:                     cciptypes.Address(config.PriceRegistry.String()),
-		MaxDataBytes:                      config.MaxDataBytes,
-		MaxPerMsgGasLimit:                 config.MaxPerMsgGasLimit,
-	}, nil
-}
-
-func (o *OnRamp) SourcePriceRegistryAddress(ctx context.Context) (cciptypes.Address, error) {
-	return o.cachedSourcePriceRegistryAddress.Get(ctx, func(ctx context.Context) (cciptypes.Address, error) {
-		c, err := o.GetDynamicConfig(ctx)
+func (o *OnRamp) GetDynamicConfig(ctx context.Context) (cciptypes.OnRampDynamicConfig, error) {
+	return o.cachedOnRampDynamicConfig.Get(ctx, func(ctx context.Context) (cciptypes.OnRampDynamicConfig, error) {
+		if o.onRamp == nil {
+			return cciptypes.OnRampDynamicConfig{}, fmt.Errorf("onramp not initialized")
+		}
+		config, err := o.onRamp.GetDynamicConfig(&bind.CallOpts{Context: ctx})
 		if err != nil {
-			return "", err
+			return cciptypes.OnRampDynamicConfig{}, fmt.Errorf("get dynamic config v1.2: %w", err)
 		}
-		return c.PriceRegistry, nil
+
+		return cciptypes.OnRampDynamicConfig{
+			Router:                            cciptypes.Address(config.Router.String()),
+			MaxNumberOfTokensPerMsg:           config.MaxNumberOfTokensPerMsg,
+			DestGasOverhead:                   config.DestGasOverhead,
+			DestGasPerPayloadByte:             config.DestGasPerPayloadByte,
+			DestDataAvailabilityOverheadGas:   config.DestDataAvailabilityOverheadGas,
+			DestGasPerDataAvailabilityByte:    config.DestGasPerDataAvailabilityByte,
+			DestDataAvailabilityMultiplierBps: config.DestDataAvailabilityMultiplierBps,
+			PriceRegistry:                     cciptypes.Address(config.PriceRegistry.String()),
+			MaxDataBytes:                      config.MaxDataBytes,
+			MaxPerMsgGasLimit:                 config.MaxPerMsgGasLimit,
+		}, nil
 	})
 }
 
+func (o *OnRamp) SourcePriceRegistryAddress(ctx context.Context) (cciptypes.Address, error) {
+	c, err := o.GetDynamicConfig(ctx)
+	if err != nil {
+		return "", err
+	}
+	return c.PriceRegistry, nil
+}
+
 func (o *OnRamp) GetSendRequestsBetweenSeqNums(ctx context.Context, seqNumMin, seqNumMax uint64, finalized bool) ([]cciptypes.EVM2EVMMessageWithTxMeta, error) {
 	logs, err := o.lp.LogsDataWordRange(
 		ctx,
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/test_helpers.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/test_helpers.go
index e7972d5f5f..fb991be59d 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/test_helpers.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_2_0/test_helpers.go
@@ -9,37 +9,37 @@ import (
 	"github.com/stretchr/testify/require"
 
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipcalc"
 )
 
 // ApplyPriceRegistryUpdate is a helper function used in tests only.
 func ApplyPriceRegistryUpdate(t *testing.T, user *bind.TransactOpts, addr common.Address, ec client.Client, gasPrices []cciptypes.GasPrice, tokenPrices []cciptypes.TokenPrice) common.Hash {
 	require.True(t, len(gasPrices) <= 2)
-	pr, err := price_registry.NewPriceRegistry(addr, ec)
+	pr, err := fee_quoter.NewFeeQuoter(addr, ec)
 	require.NoError(t, err)
 	o, err := pr.Owner(nil)
 	require.NoError(t, err)
 	require.Equal(t, user.From, o)
-	var tps []price_registry.InternalTokenPriceUpdate
+	var tps []fee_quoter.InternalTokenPriceUpdate
 	for _, tp := range tokenPrices {
 		evmAddrs, err1 := ccipcalc.GenericAddrsToEvm(tp.Token)
 		assert.NoError(t, err1)
-		tps = append(tps, price_registry.InternalTokenPriceUpdate{
+		tps = append(tps, fee_quoter.InternalTokenPriceUpdate{
 			SourceToken: evmAddrs[0],
 			UsdPerToken: tp.Value,
 		})
 	}
-	var gps []price_registry.InternalGasPriceUpdate
+	var gps []fee_quoter.InternalGasPriceUpdate
 	for _, gp := range gasPrices {
-		gps = append(gps, price_registry.InternalGasPriceUpdate{
+		gps = append(gps, fee_quoter.InternalGasPriceUpdate{
 			DestChainSelector: gp.DestChainSelector,
 			UsdPerUnitGas:     gp.Value,
 		})
 	}
-	tx, err := pr.UpdatePrices(user, price_registry.InternalPriceUpdates{
+	tx, err := pr.UpdatePrices(user, fee_quoter.InternalPriceUpdates{
 		TokenPriceUpdates: tps,
 		GasPriceUpdates:   gps,
 	})
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/commit_store.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/commit_store.go
index 3bb582f3a2..d5545174cb 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/commit_store.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/commit_store.go
@@ -3,6 +3,8 @@ package v1_5_0
 import (
 	"context"
 
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata"
+
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 
@@ -41,8 +43,14 @@ func (c *CommitStore) IsDown(ctx context.Context) (bool, error) {
 	return !unPausedAndNotCursed, nil
 }
 
-func NewCommitStore(lggr logger.Logger, addr common.Address, ec client.Client, lp logpoller.LogPoller) (*CommitStore, error) {
-	v120, err := v1_2_0.NewCommitStore(lggr, addr, ec, lp)
+func NewCommitStore(
+	lggr logger.Logger,
+	addr common.Address,
+	ec client.Client,
+	lp logpoller.LogPoller,
+	feeEstimatorConfig ccipdata.FeeEstimatorConfigReader,
+) (*CommitStore, error) {
+	v120, err := v1_2_0.NewCommitStore(lggr, addr, ec, lp, feeEstimatorConfig)
 	if err != nil {
 		return nil, err
 	}
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/offramp.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/offramp.go
index 15f52bd713..11e7be1a55 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/offramp.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/offramp.go
@@ -70,6 +70,7 @@ type OffRamp struct {
 	*v1_2_0.OffRamp
 	offRampV150           evm_2_evm_offramp.EVM2EVMOffRampInterface
 	cachedRateLimitTokens cache.AutoSync[cciptypes.OffRampTokens]
+	feeEstimatorConfig    ccipdata.FeeEstimatorConfigReader
 }
 
 // GetTokens Returns no data as the offRamps no longer have this information.
@@ -155,7 +156,7 @@ func (o *OffRamp) ChangeConfig(ctx context.Context, onchainConfigBytes []byte, o
 		PermissionLessExecutionThresholdSeconds: time.Second * time.Duration(onchainConfigParsed.PermissionLessExecutionThresholdSeconds),
 		Router:                                  cciptypes.Address(onchainConfigParsed.Router.String()),
 	}
-	priceEstimator := prices.NewDAGasPriceEstimator(o.Estimator, o.DestMaxGasPrice, 0, 0)
+	priceEstimator := prices.NewDAGasPriceEstimator(o.Estimator, o.DestMaxGasPrice, 0, 0, o.feeEstimatorConfig)
 
 	o.UpdateDynamicConfig(onchainConfig, offchainConfig, priceEstimator)
 
@@ -166,8 +167,16 @@ func (o *OffRamp) ChangeConfig(ctx context.Context, onchainConfigBytes []byte, o
 		cciptypes.Address(destWrappedNative.String()), nil
 }
 
-func NewOffRamp(lggr logger.Logger, addr common.Address, ec client.Client, lp logpoller.LogPoller, estimator gas.EvmFeeEstimator, destMaxGasPrice *big.Int) (*OffRamp, error) {
-	v120, err := v1_2_0.NewOffRamp(lggr, addr, ec, lp, estimator, destMaxGasPrice)
+func NewOffRamp(
+	lggr logger.Logger,
+	addr common.Address,
+	ec client.Client,
+	lp logpoller.LogPoller,
+	estimator gas.EvmFeeEstimator,
+	destMaxGasPrice *big.Int,
+	feeEstimatorConfig ccipdata.FeeEstimatorConfigReader,
+) (*OffRamp, error) {
+	v120, err := v1_2_0.NewOffRamp(lggr, addr, ec, lp, estimator, destMaxGasPrice, feeEstimatorConfig)
 	if err != nil {
 		return nil, err
 	}
@@ -180,8 +189,9 @@ func NewOffRamp(lggr logger.Logger, addr common.Address, ec client.Client, lp lo
 	v120.ExecutionReportArgs = abihelpers.MustGetMethodInputs("manuallyExecute", abiOffRamp)[:1]
 
 	return &OffRamp{
-		OffRamp:     v120,
-		offRampV150: offRamp,
+		feeEstimatorConfig: feeEstimatorConfig,
+		OffRamp:            v120,
+		offRampV150:        offRamp,
 		cachedRateLimitTokens: cache.NewLogpollerEventsBased[cciptypes.OffRampTokens](
 			lp,
 			[]common.Hash{RateLimitTokenAddedEvent, RateLimitTokenRemovedEvent},
diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/onramp.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/onramp.go
index 354a5defdd..5a9377858d 100644
--- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/onramp.go
+++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_5_0/onramp.go
@@ -50,17 +50,17 @@ func init() {
 var _ ccipdata.OnRampReader = &OnRamp{}
 
 type OnRamp struct {
-	onRamp                           *evm_2_evm_onramp.EVM2EVMOnRamp
-	address                          common.Address
-	destChainSelectorBytes           [16]byte
-	lggr                             logger.Logger
-	lp                               logpoller.LogPoller
-	leafHasher                       ccipdata.LeafHasherInterface[[32]byte]
-	client                           client.Client
-	sendRequestedEventSig            common.Hash
-	sendRequestedSeqNumberWord       int
-	filters                          []logpoller.Filter
-	cachedSourcePriceRegistryAddress cache.AutoSync[cciptypes.Address]
+	onRamp                     *evm_2_evm_onramp.EVM2EVMOnRamp
+	address                    common.Address
+	destChainSelectorBytes     [16]byte
+	lggr                       logger.Logger
+	lp                         logpoller.LogPoller
+	leafHasher                 ccipdata.LeafHasherInterface[[32]byte]
+	client                     client.Client
+	sendRequestedEventSig      common.Hash
+	sendRequestedSeqNumberWord int
+	filters                    []logpoller.Filter
+	cachedOnRampDynamicConfig  cache.AutoSync[cciptypes.OnRampDynamicConfig]
 	// Static config can be cached, because it's never expected to change.
 	// The only way to change that is through the contract's constructor (redeployment)
 	cachedStaticConfig cache.OnceCtxFunction[evm_2_evm_onramp.EVM2EVMOnRampStaticConfig]
@@ -112,7 +112,7 @@ func NewOnRamp(lggr logger.Logger, sourceSelector, destSelector uint64, onRampAd
 		address:                    onRampAddress,
 		sendRequestedSeqNumberWord: CCIPSendRequestSeqNumIndex,
 		sendRequestedEventSig:      CCIPSendRequestEventSig,
-		cachedSourcePriceRegistryAddress: cache.NewLogpollerEventsBased[cciptypes.Address](
+		cachedOnRampDynamicConfig: cache.NewLogpollerEventsBased[cciptypes.OnRampDynamicConfig](
 			sourceLP,
 			[]common.Hash{ConfigSetEventSig},
 			onRampAddress,
@@ -126,38 +126,39 @@ func (o *OnRamp) Address(context.Context) (cciptypes.Address, error) {
 	return ccipcalc.EvmAddrToGeneric(o.onRamp.Address()), nil
 }
 
-func (o *OnRamp) GetDynamicConfig(context.Context) (cciptypes.OnRampDynamicConfig, error) {
-	if o.onRamp == nil {
-		return cciptypes.OnRampDynamicConfig{}, fmt.Errorf("onramp not initialized")
-	}
-	config, err := o.onRamp.GetDynamicConfig(&bind.CallOpts{})
-	if err != nil {
-		return cciptypes.OnRampDynamicConfig{}, fmt.Errorf("get dynamic config v1.5: %w", err)
-	}
-	return cciptypes.OnRampDynamicConfig{
-		Router:                            ccipcalc.EvmAddrToGeneric(config.Router),
-		MaxNumberOfTokensPerMsg:           config.MaxNumberOfTokensPerMsg,
-		DestGasOverhead:                   config.DestGasOverhead,
-		DestGasPerPayloadByte:             config.DestGasPerPayloadByte,
-		DestDataAvailabilityOverheadGas:   config.DestDataAvailabilityOverheadGas,
-		DestGasPerDataAvailabilityByte:    config.DestGasPerDataAvailabilityByte,
-		DestDataAvailabilityMultiplierBps: config.DestDataAvailabilityMultiplierBps,
-		PriceRegistry:                     ccipcalc.EvmAddrToGeneric(config.PriceRegistry),
-		MaxDataBytes:                      config.MaxDataBytes,
-		MaxPerMsgGasLimit:                 config.MaxPerMsgGasLimit,
-	}, nil
-}
-
-func (o *OnRamp) SourcePriceRegistryAddress(ctx context.Context) (cciptypes.Address, error) {
-	return o.cachedSourcePriceRegistryAddress.Get(ctx, func(ctx context.Context) (cciptypes.Address, error) {
-		c, err := o.GetDynamicConfig(ctx)
+func (o *OnRamp) GetDynamicConfig(ctx context.Context) (cciptypes.OnRampDynamicConfig, error) {
+	return o.cachedOnRampDynamicConfig.Get(ctx, func(ctx context.Context) (cciptypes.OnRampDynamicConfig, error) {
+		if o.onRamp == nil {
+			return cciptypes.OnRampDynamicConfig{}, fmt.Errorf("onramp not initialized")
+		}
+		config, err := o.onRamp.GetDynamicConfig(&bind.CallOpts{})
 		if err != nil {
-			return "", err
+			return cciptypes.OnRampDynamicConfig{}, fmt.Errorf("get dynamic config v1.5: %w", err)
 		}
-		return c.PriceRegistry, nil
+
+		return cciptypes.OnRampDynamicConfig{
+			Router:                            ccipcalc.EvmAddrToGeneric(config.Router),
+			MaxNumberOfTokensPerMsg:           config.MaxNumberOfTokensPerMsg,
+			DestGasOverhead:                   config.DestGasOverhead,
+			DestGasPerPayloadByte:             config.DestGasPerPayloadByte,
+			DestDataAvailabilityOverheadGas:   config.DestDataAvailabilityOverheadGas,
+			DestGasPerDataAvailabilityByte:    config.DestGasPerDataAvailabilityByte,
+			DestDataAvailabilityMultiplierBps: config.DestDataAvailabilityMultiplierBps,
+			PriceRegistry:                     ccipcalc.EvmAddrToGeneric(config.PriceRegistry),
+			MaxDataBytes:                      config.MaxDataBytes,
+			MaxPerMsgGasLimit:                 config.MaxPerMsgGasLimit,
+		}, nil
 	})
 }
 
+func (o *OnRamp) SourcePriceRegistryAddress(ctx context.Context) (cciptypes.Address, error) {
+	c, err := o.GetDynamicConfig(ctx)
+	if err != nil {
+		return "", err
+	}
+	return c.PriceRegistry, nil
+}
+
 func (o *OnRamp) GetSendRequestsBetweenSeqNums(ctx context.Context, seqNumMin, seqNumMax uint64, finalized bool) ([]cciptypes.EVM2EVMMessageWithTxMeta, error) {
 	logs, err := o.lp.LogsDataWordRange(
 		ctx,
diff --git a/core/services/ocr2/plugins/ccip/prices/da_price_estimator.go b/core/services/ocr2/plugins/ccip/prices/da_price_estimator.go
index 7c75b9bdd9..b27494ad60 100644
--- a/core/services/ocr2/plugins/ccip/prices/da_price_estimator.go
+++ b/core/services/ocr2/plugins/ccip/prices/da_price_estimator.go
@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata"
+
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/rollups"
@@ -14,11 +16,9 @@ import (
 type DAGasPriceEstimator struct {
 	execEstimator       GasPriceEstimator
 	l1Oracle            rollups.L1Oracle
+	feeEstimatorConfig  ccipdata.FeeEstimatorConfigReader
 	priceEncodingLength uint
 	daDeviationPPB      int64
-	daOverheadGas       int64
-	gasPerDAByte        int64
-	daMultiplier        int64
 }
 
 func NewDAGasPriceEstimator(
@@ -26,12 +26,14 @@ func NewDAGasPriceEstimator(
 	maxGasPrice *big.Int,
 	deviationPPB int64,
 	daDeviationPPB int64,
+	feeEstimatorConfig ccipdata.FeeEstimatorConfigReader, // DA Config Cache updates in the onRamp reader and shares the state
 ) *DAGasPriceEstimator {
 	return &DAGasPriceEstimator{
 		execEstimator:       NewExecGasPriceEstimator(estimator, maxGasPrice, deviationPPB),
 		l1Oracle:            estimator.L1Oracle(),
 		priceEncodingLength: daGasPriceEncodingLength,
 		daDeviationPPB:      daDeviationPPB,
+		feeEstimatorConfig:  feeEstimatorConfig,
 	}
 }
 
@@ -141,7 +143,10 @@ func (g DAGasPriceEstimator) EstimateMsgCostUSD(p *big.Int, wrappedNativePrice *
 
 	// If there is data availability price component, then include data availability cost in fee estimation
 	if daGasPrice.Cmp(big.NewInt(0)) > 0 {
-		daGasCostUSD := g.estimateDACostUSD(daGasPrice, wrappedNativePrice, msg)
+		daGasCostUSD, err := g.estimateDACostUSD(daGasPrice, wrappedNativePrice, msg)
+		if err != nil {
+			return nil, err
+		}
 		execCostUSD = new(big.Int).Add(daGasCostUSD, execCostUSD)
 	}
 	return execCostUSD, nil
@@ -160,17 +165,22 @@ func (g DAGasPriceEstimator) parseEncodedGasPrice(p *big.Int) (*big.Int, *big.In
 	return daGasPrice, execGasPrice, nil
 }
 
-func (g DAGasPriceEstimator) estimateDACostUSD(daGasPrice *big.Int, wrappedNativePrice *big.Int, msg cciptypes.EVM2EVMOnRampCCIPSendRequestedWithMeta) *big.Int {
+func (g DAGasPriceEstimator) estimateDACostUSD(daGasPrice *big.Int, wrappedNativePrice *big.Int, msg cciptypes.EVM2EVMOnRampCCIPSendRequestedWithMeta) (*big.Int, error) {
 	var sourceTokenDataLen int
 	for _, tokenData := range msg.SourceTokenData {
 		sourceTokenDataLen += len(tokenData)
 	}
 
+	daOverheadGas, gasPerDAByte, daMultiplier, err := g.feeEstimatorConfig.GetDataAvailabilityConfig(context.Background())
+	if err != nil {
+		return nil, err
+	}
+
 	dataLen := evmMessageFixedBytes + len(msg.Data) + len(msg.TokenAmounts)*evmMessageBytesPerToken + sourceTokenDataLen
-	dataGas := big.NewInt(int64(dataLen)*g.gasPerDAByte + g.daOverheadGas)
+	dataGas := big.NewInt(int64(dataLen)*gasPerDAByte + daOverheadGas)
 
 	dataGasEstimate := new(big.Int).Mul(dataGas, daGasPrice)
-	dataGasEstimate = new(big.Int).Div(new(big.Int).Mul(dataGasEstimate, big.NewInt(g.daMultiplier)), big.NewInt(daMultiplierBase))
+	dataGasEstimate = new(big.Int).Div(new(big.Int).Mul(dataGasEstimate, big.NewInt(daMultiplier)), big.NewInt(daMultiplierBase))
 
-	return ccipcalc.CalculateUsdPerUnitGas(dataGasEstimate, wrappedNativePrice)
+	return ccipcalc.CalculateUsdPerUnitGas(dataGasEstimate, wrappedNativePrice), nil
 }
diff --git a/core/services/ocr2/plugins/ccip/prices/da_price_estimator_test.go b/core/services/ocr2/plugins/ccip/prices/da_price_estimator_test.go
index 2f8616a866..158f02c4f0 100644
--- a/core/services/ocr2/plugins/ccip/prices/da_price_estimator_test.go
+++ b/core/services/ocr2/plugins/ccip/prices/da_price_estimator_test.go
@@ -2,6 +2,7 @@ package prices
 
 import (
 	"context"
+	"errors"
 	"math/big"
 	"testing"
 
@@ -11,6 +12,7 @@ import (
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/rollups/mocks"
+	ccipdatamocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks"
 )
 
 func encodeGasPrice(daPrice, execPrice *big.Int) *big.Int {
@@ -325,14 +327,17 @@ func TestDAPriceEstimator_EstimateMsgCostUSD(t *testing.T) {
 	execCostUSD := big.NewInt(100_000)
 
 	testCases := []struct {
-		name               string
-		gasPrice           *big.Int
-		wrappedNativePrice *big.Int
-		msg                cciptypes.EVM2EVMOnRampCCIPSendRequestedWithMeta
-		daOverheadGas      int64
-		gasPerDAByte       int64
-		daMultiplier       int64
-		expUSD             *big.Int
+		name                  string
+		gasPrice              *big.Int
+		wrappedNativePrice    *big.Int
+		msg                   cciptypes.EVM2EVMOnRampCCIPSendRequestedWithMeta
+		daOverheadGas         int64
+		gasPerDAByte          int64
+		daMultiplier          int64
+		expUSD                *big.Int
+		onRampConfig          cciptypes.OnRampDynamicConfig
+		execEstimatorResponse []any
+		execEstimatorErr      error
 	}{
 		{
 			name:               "only DA overhead",
@@ -345,10 +350,8 @@ func TestDAPriceEstimator_EstimateMsgCostUSD(t *testing.T) {
 					SourceTokenData: [][]byte{},
 				},
 			},
-			daOverheadGas: 100_000,
-			gasPerDAByte:  0,
-			daMultiplier:  10_000, // 1x multiplier
-			expUSD:        new(big.Int).Add(execCostUSD, big.NewInt(100_000e9)),
+			expUSD:                new(big.Int).Add(execCostUSD, big.NewInt(100_000e9)),
+			execEstimatorResponse: []any{int64(100_000), int64(0), int64(10_000), nil},
 		},
 		{
 			name:               "include message data gas",
@@ -363,10 +366,8 @@ func TestDAPriceEstimator_EstimateMsgCostUSD(t *testing.T) {
 					},
 				},
 			},
-			daOverheadGas: 100_000,
-			gasPerDAByte:  16,
-			daMultiplier:  10_000, // 1x multiplier
-			expUSD:        new(big.Int).Add(execCostUSD, big.NewInt(134_208e9)),
+			expUSD:                new(big.Int).Add(execCostUSD, big.NewInt(134_208e9)),
+			execEstimatorResponse: []any{int64(100_000), int64(16), int64(10_000), nil},
 		},
 		{
 			name:               "zero DA price",
@@ -379,10 +380,7 @@ func TestDAPriceEstimator_EstimateMsgCostUSD(t *testing.T) {
 					SourceTokenData: [][]byte{},
 				},
 			},
-			daOverheadGas: 100_000,
-			gasPerDAByte:  16,
-			daMultiplier:  10_000, // 1x multiplier
-			expUSD:        execCostUSD,
+			expUSD: execCostUSD,
 		},
 		{
 			name:               "double native price",
@@ -395,10 +393,8 @@ func TestDAPriceEstimator_EstimateMsgCostUSD(t *testing.T) {
 					SourceTokenData: [][]byte{},
 				},
 			},
-			daOverheadGas: 100_000,
-			gasPerDAByte:  0,
-			daMultiplier:  10_000, // 1x multiplier
-			expUSD:        new(big.Int).Add(execCostUSD, big.NewInt(200_000e9)),
+			expUSD:                new(big.Int).Add(execCostUSD, big.NewInt(200_000e9)),
+			execEstimatorResponse: []any{int64(100_000), int64(0), int64(10_000), nil},
 		},
 		{
 			name:               "half multiplier",
@@ -411,30 +407,66 @@ func TestDAPriceEstimator_EstimateMsgCostUSD(t *testing.T) {
 					SourceTokenData: [][]byte{},
 				},
 			},
-			daOverheadGas: 100_000,
-			gasPerDAByte:  0,
-			daMultiplier:  5_000, // 0.5x multiplier
-			expUSD:        new(big.Int).Add(execCostUSD, big.NewInt(50_000e9)),
+			expUSD:                new(big.Int).Add(execCostUSD, big.NewInt(50_000e9)),
+			execEstimatorResponse: []any{int64(100_000), int64(0), int64(5_000), nil},
+		},
+		{
+			name:               "onRamp reader error",
+			gasPrice:           encodeGasPrice(big.NewInt(1e9), big.NewInt(0)), // 1 gwei DA price, 0 exec price
+			wrappedNativePrice: big.NewInt(1e18),                               // $1
+			msg: cciptypes.EVM2EVMOnRampCCIPSendRequestedWithMeta{
+				EVM2EVMMessage: cciptypes.EVM2EVMMessage{
+					Data:            []byte{},
+					TokenAmounts:    []cciptypes.TokenAmount{},
+					SourceTokenData: [][]byte{},
+				},
+			},
+			execEstimatorResponse: []any{int64(0), int64(0), int64(0), errors.New("some reader error")},
+		},
+		{
+			name:               "execEstimator error",
+			gasPrice:           encodeGasPrice(big.NewInt(1e9), big.NewInt(0)), // 1 gwei DA price, 0 exec price
+			wrappedNativePrice: big.NewInt(1e18),                               // $1
+			msg: cciptypes.EVM2EVMOnRampCCIPSendRequestedWithMeta{
+				EVM2EVMMessage: cciptypes.EVM2EVMMessage{
+					Data:            []byte{},
+					TokenAmounts:    []cciptypes.TokenAmount{},
+					SourceTokenData: [][]byte{},
+				},
+			},
+			execEstimatorErr: errors.New("some estimator error"),
 		},
 	}
 
 	for _, tc := range testCases {
-		execEstimator := NewMockGasPriceEstimator(t)
-		execEstimator.On("EstimateMsgCostUSD", mock.Anything, tc.wrappedNativePrice, tc.msg).Return(execCostUSD, nil)
-
 		t.Run(tc.name, func(t *testing.T) {
+			execEstimator := NewMockGasPriceEstimator(t)
+			execEstimator.On("EstimateMsgCostUSD", mock.Anything, tc.wrappedNativePrice, tc.msg).
+				Return(execCostUSD, tc.execEstimatorErr)
+
+			feeEstimatorConfig := ccipdatamocks.NewFeeEstimatorConfigReader(t)
+			if len(tc.execEstimatorResponse) > 0 {
+				feeEstimatorConfig.On("GetDataAvailabilityConfig", mock.Anything).
+					Return(tc.execEstimatorResponse...)
+			}
+
 			g := DAGasPriceEstimator{
 				execEstimator:       execEstimator,
 				l1Oracle:            nil,
 				priceEncodingLength: daGasPriceEncodingLength,
-				daOverheadGas:       tc.daOverheadGas,
-				gasPerDAByte:        tc.gasPerDAByte,
-				daMultiplier:        tc.daMultiplier,
+				feeEstimatorConfig:  feeEstimatorConfig,
 			}
 
 			costUSD, err := g.EstimateMsgCostUSD(tc.gasPrice, tc.wrappedNativePrice, tc.msg)
-			assert.NoError(t, err)
-			assert.Equal(t, tc.expUSD, costUSD)
+
+			switch {
+			case len(tc.execEstimatorResponse) == 4 && tc.execEstimatorResponse[3] != nil,
+				tc.execEstimatorErr != nil:
+				assert.Error(t, err)
+			default:
+				assert.NoError(t, err)
+				assert.Equal(t, tc.expUSD, costUSD)
+			}
 		})
 	}
 }
diff --git a/core/services/ocr2/plugins/ccip/prices/gas_price_estimator.go b/core/services/ocr2/plugins/ccip/prices/gas_price_estimator.go
index 49a6fbcc4a..4aac664e33 100644
--- a/core/services/ocr2/plugins/ccip/prices/gas_price_estimator.go
+++ b/core/services/ocr2/plugins/ccip/prices/gas_price_estimator.go
@@ -3,6 +3,8 @@ package prices
 import (
 	"math/big"
 
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata"
+
 	"github.com/Masterminds/semver/v3"
 	"github.com/pkg/errors"
 
@@ -47,12 +49,13 @@ func NewGasPriceEstimatorForCommitPlugin(
 	maxExecGasPrice *big.Int,
 	daDeviationPPB int64,
 	execDeviationPPB int64,
+	feeEstimatorConfig ccipdata.FeeEstimatorConfigReader,
 ) (GasPriceEstimatorCommit, error) {
 	switch commitStoreVersion.String() {
 	case "1.0.0", "1.1.0":
 		return NewExecGasPriceEstimator(estimator, maxExecGasPrice, execDeviationPPB), nil
 	case "1.2.0":
-		return NewDAGasPriceEstimator(estimator, maxExecGasPrice, execDeviationPPB, daDeviationPPB), nil
+		return NewDAGasPriceEstimator(estimator, maxExecGasPrice, execDeviationPPB, daDeviationPPB, feeEstimatorConfig), nil
 	default:
 		return nil, errors.Errorf("Invalid commitStore version: %s", commitStoreVersion)
 	}
diff --git a/core/services/relay/evm/ccip.go b/core/services/relay/evm/ccip.go
index 34a732e145..945763de85 100644
--- a/core/services/relay/evm/ccip.go
+++ b/core/services/relay/evm/ccip.go
@@ -6,18 +6,16 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/abihelpers"
-
+	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/abihelpers"
 	ccipconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/config"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/estimatorconfig"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/prices"
-
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
 )
 
 var _ cciptypes.CommitStoreReader = (*IncompleteSourceCommitStoreReader)(nil)
@@ -26,16 +24,18 @@ var _ cciptypes.CommitStoreReader = (*IncompleteDestCommitStoreReader)(nil)
 // IncompleteSourceCommitStoreReader is an implementation of CommitStoreReader with the only valid methods being
 // GasPriceEstimator, ChangeConfig, and OffchainConfig
 type IncompleteSourceCommitStoreReader struct {
-	estimator         gas.EvmFeeEstimator
-	gasPriceEstimator *prices.DAGasPriceEstimator
-	sourceMaxGasPrice *big.Int
-	offchainConfig    cciptypes.CommitOffchainConfig
+	estimator          gas.EvmFeeEstimator
+	gasPriceEstimator  *prices.DAGasPriceEstimator
+	sourceMaxGasPrice  *big.Int
+	offchainConfig     cciptypes.CommitOffchainConfig
+	feeEstimatorConfig estimatorconfig.FeeEstimatorConfigProvider
 }
 
-func NewIncompleteSourceCommitStoreReader(estimator gas.EvmFeeEstimator, sourceMaxGasPrice *big.Int) *IncompleteSourceCommitStoreReader {
+func NewIncompleteSourceCommitStoreReader(estimator gas.EvmFeeEstimator, sourceMaxGasPrice *big.Int, feeEstimatorConfig estimatorconfig.FeeEstimatorConfigProvider) *IncompleteSourceCommitStoreReader {
 	return &IncompleteSourceCommitStoreReader{
-		estimator:         estimator,
-		sourceMaxGasPrice: sourceMaxGasPrice,
+		estimator:          estimator,
+		sourceMaxGasPrice:  sourceMaxGasPrice,
+		feeEstimatorConfig: feeEstimatorConfig,
 	}
 }
 
@@ -55,6 +55,7 @@ func (i *IncompleteSourceCommitStoreReader) ChangeConfig(ctx context.Context, on
 		i.sourceMaxGasPrice,
 		int64(offchainConfigParsed.ExecGasPriceDeviationPPB),
 		int64(offchainConfigParsed.DAGasPriceDeviationPPB),
+		i.feeEstimatorConfig,
 	)
 	i.offchainConfig = ccip.NewCommitOffchainConfig(
 		offchainConfigParsed.ExecGasPriceDeviationPPB,
@@ -133,8 +134,15 @@ type IncompleteDestCommitStoreReader struct {
 	cs cciptypes.CommitStoreReader
 }
 
-func NewIncompleteDestCommitStoreReader(lggr logger.Logger, versionFinder ccip.VersionFinder, address cciptypes.Address, ec client.Client, lp logpoller.LogPoller) (*IncompleteDestCommitStoreReader, error) {
-	cs, err := ccip.NewCommitStoreReader(lggr, versionFinder, address, ec, lp)
+func NewIncompleteDestCommitStoreReader(
+	lggr logger.Logger,
+	versionFinder ccip.VersionFinder,
+	address cciptypes.Address,
+	ec client.Client,
+	lp logpoller.LogPoller,
+	feeEstimatorConfig estimatorconfig.FeeEstimatorConfigProvider,
+) (*IncompleteDestCommitStoreReader, error) {
+	cs, err := ccip.NewCommitStoreReader(lggr, versionFinder, address, ec, lp, feeEstimatorConfig)
 	if err != nil {
 		return nil, err
 	}
diff --git a/core/services/relay/evm/commit_provider.go b/core/services/relay/evm/commit_provider.go
index 35de8efbd8..780d1cee7b 100644
--- a/core/services/relay/evm/commit_provider.go
+++ b/core/services/relay/evm/commit_provider.go
@@ -18,18 +18,20 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/estimatorconfig"
 )
 
 var _ commontypes.CCIPCommitProvider = (*SrcCommitProvider)(nil)
 var _ commontypes.CCIPCommitProvider = (*DstCommitProvider)(nil)
 
 type SrcCommitProvider struct {
-	lggr        logger.Logger
-	startBlock  uint64
-	client      client.Client
-	lp          logpoller.LogPoller
-	estimator   gas.EvmFeeEstimator
-	maxGasPrice *big.Int
+	lggr               logger.Logger
+	startBlock         uint64
+	client             client.Client
+	lp                 logpoller.LogPoller
+	estimator          gas.EvmFeeEstimator
+	maxGasPrice        *big.Int
+	feeEstimatorConfig estimatorconfig.FeeEstimatorConfigProvider
 
 	// these values will be lazily initialized
 	seenOnRampAddress       *cciptypes.Address
@@ -44,14 +46,16 @@ func NewSrcCommitProvider(
 	lp logpoller.LogPoller,
 	srcEstimator gas.EvmFeeEstimator,
 	maxGasPrice *big.Int,
+	feeEstimatorConfig estimatorconfig.FeeEstimatorConfigProvider,
 ) commontypes.CCIPCommitProvider {
 	return &SrcCommitProvider{
-		lggr:        lggr,
-		startBlock:  startBlock,
-		client:      client,
-		lp:          lp,
-		estimator:   srcEstimator,
-		maxGasPrice: maxGasPrice,
+		lggr:               lggr,
+		startBlock:         startBlock,
+		client:             client,
+		lp:                 lp,
+		estimator:          srcEstimator,
+		maxGasPrice:        maxGasPrice,
+		feeEstimatorConfig: feeEstimatorConfig,
 	}
 }
 
@@ -65,6 +69,7 @@ type DstCommitProvider struct {
 	configWatcher       *configWatcher
 	gasEstimator        gas.EvmFeeEstimator
 	maxGasPrice         big.Int
+	feeEstimatorConfig  estimatorconfig.FeeEstimatorConfigProvider
 
 	// these values will be lazily initialized
 	seenCommitStoreAddress *cciptypes.Address
@@ -81,6 +86,7 @@ func NewDstCommitProvider(
 	maxGasPrice big.Int,
 	contractTransmitter contractTransmitter,
 	configWatcher *configWatcher,
+	feeEstimatorConfig estimatorconfig.FeeEstimatorConfigProvider,
 ) commontypes.CCIPCommitProvider {
 	return &DstCommitProvider{
 		lggr:                lggr,
@@ -92,6 +98,7 @@ func NewDstCommitProvider(
 		configWatcher:       configWatcher,
 		gasEstimator:        gasEstimator,
 		maxGasPrice:         maxGasPrice,
+		feeEstimatorConfig:  feeEstimatorConfig,
 	}
 }
 
@@ -170,13 +177,13 @@ func (P *DstCommitProvider) Close() error {
 		if P.seenCommitStoreAddress == nil {
 			return nil
 		}
-		return ccip.CloseCommitStoreReader(P.lggr, versionFinder, *P.seenCommitStoreAddress, P.client, P.lp)
+		return ccip.CloseCommitStoreReader(P.lggr, versionFinder, *P.seenCommitStoreAddress, P.client, P.lp, P.feeEstimatorConfig)
 	})
 	unregisterFuncs = append(unregisterFuncs, func() error {
 		if P.seenOffRampAddress == nil {
 			return nil
 		}
-		return ccip.CloseOffRampReader(P.lggr, versionFinder, *P.seenOffRampAddress, P.client, P.lp, nil, big.NewInt(0))
+		return ccip.CloseOffRampReader(P.lggr, versionFinder, *P.seenOffRampAddress, P.client, P.lp, nil, big.NewInt(0), P.feeEstimatorConfig)
 	})
 
 	var multiErr error
@@ -241,7 +248,7 @@ func (P *DstCommitProvider) NewPriceGetter(ctx context.Context) (priceGetter cci
 }
 
 func (P *SrcCommitProvider) NewCommitStoreReader(ctx context.Context, commitStoreAddress cciptypes.Address) (commitStoreReader cciptypes.CommitStoreReader, err error) {
-	commitStoreReader = NewIncompleteSourceCommitStoreReader(P.estimator, P.maxGasPrice)
+	commitStoreReader = NewIncompleteSourceCommitStoreReader(P.estimator, P.maxGasPrice, P.feeEstimatorConfig)
 	return
 }
 
@@ -249,7 +256,7 @@ func (P *DstCommitProvider) NewCommitStoreReader(ctx context.Context, commitStor
 	P.seenCommitStoreAddress = &commitStoreAddress
 
 	versionFinder := ccip.NewEvmVersionFinder()
-	commitStoreReader, err = NewIncompleteDestCommitStoreReader(P.lggr, versionFinder, commitStoreAddress, P.client, P.lp)
+	commitStoreReader, err = NewIncompleteDestCommitStoreReader(P.lggr, versionFinder, commitStoreAddress, P.client, P.lp, P.feeEstimatorConfig)
 	return
 }
 
@@ -259,7 +266,12 @@ func (P *SrcCommitProvider) NewOnRampReader(ctx context.Context, onRampAddress c
 	P.seenDestChainSelector = &destChainSelector
 
 	versionFinder := ccip.NewEvmVersionFinder()
+
 	onRampReader, err = ccip.NewOnRampReader(P.lggr, versionFinder, sourceChainSelector, destChainSelector, onRampAddress, P.lp, P.client)
+	if err != nil {
+		return nil, err
+	}
+	P.feeEstimatorConfig.SetOnRampReader(onRampReader)
 	return
 }
 
@@ -272,7 +284,7 @@ func (P *SrcCommitProvider) NewOffRampReader(ctx context.Context, offRampAddr cc
 }
 
 func (P *DstCommitProvider) NewOffRampReader(ctx context.Context, offRampAddr cciptypes.Address) (offRampReader cciptypes.OffRampReader, err error) {
-	offRampReader, err = ccip.NewOffRampReader(P.lggr, P.versionFinder, offRampAddr, P.client, P.lp, P.gasEstimator, &P.maxGasPrice, true)
+	offRampReader, err = ccip.NewOffRampReader(P.lggr, P.versionFinder, offRampAddr, P.client, P.lp, P.gasEstimator, &P.maxGasPrice, true, P.feeEstimatorConfig)
 	return
 }
 
diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go
index fe84949903..85cb3486ca 100644
--- a/core/services/relay/evm/evm.go
+++ b/core/services/relay/evm/evm.go
@@ -45,6 +45,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/llo"
 	"github.com/smartcontractkit/chainlink/v2/core/services/llo/bm"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/estimatorconfig"
 	lloconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/llo/config"
 	mercuryconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/mercury/config"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
@@ -406,6 +407,8 @@ func (r *Relayer) NewCCIPCommitProvider(rargs commontypes.RelayArgs, pargs commo
 	sourceStartBlock := commitPluginConfig.SourceStartBlock
 	destStartBlock := commitPluginConfig.DestStartBlock
 
+	feeEstimatorConfig := estimatorconfig.NewFeeEstimatorConfigService()
+
 	// The src chain implementation of this provider does not need a configWatcher or contractTransmitter;
 	// bail early.
 	if commitPluginConfig.IsSourceProvider {
@@ -416,6 +419,7 @@ func (r *Relayer) NewCCIPCommitProvider(rargs commontypes.RelayArgs, pargs commo
 			r.chain.LogPoller(),
 			r.chain.GasEstimator(),
 			r.chain.Config().EVM().GasEstimator().PriceMax().ToInt(),
+			feeEstimatorConfig,
 		), nil
 	}
 
@@ -451,6 +455,7 @@ func (r *Relayer) NewCCIPCommitProvider(rargs commontypes.RelayArgs, pargs commo
 		*r.chain.Config().EVM().GasEstimator().PriceMax().ToInt(),
 		*contractTransmitter,
 		configWatcher,
+		feeEstimatorConfig,
 	), nil
 }
 
@@ -473,6 +478,8 @@ func (r *Relayer) NewCCIPExecProvider(rargs commontypes.RelayArgs, pargs commont
 
 	usdcConfig := execPluginConfig.USDCConfig
 
+	feeEstimatorConfig := estimatorconfig.NewFeeEstimatorConfigService()
+
 	// The src chain implementation of this provider does not need a configWatcher or contractTransmitter;
 	// bail early.
 	if execPluginConfig.IsSourceProvider {
@@ -489,6 +496,7 @@ func (r *Relayer) NewCCIPExecProvider(rargs commontypes.RelayArgs, pargs commont
 			int(usdcConfig.AttestationAPITimeoutSeconds),
 			usdcConfig.AttestationAPIIntervalMilliseconds,
 			usdcConfig.SourceMessageTransmitterAddress,
+			feeEstimatorConfig,
 		)
 	}
 
@@ -524,6 +532,7 @@ func (r *Relayer) NewCCIPExecProvider(rargs commontypes.RelayArgs, pargs commont
 		configWatcher,
 		r.chain.GasEstimator(),
 		*r.chain.Config().EVM().GasEstimator().PriceMax().ToInt(),
+		feeEstimatorConfig,
 		r.chain.TxManager(),
 		cciptypes.Address(rargs.ContractID),
 	)
diff --git a/core/services/relay/evm/exec_provider.go b/core/services/relay/evm/exec_provider.go
index d0e567af73..e50ae41351 100644
--- a/core/services/relay/evm/exec_provider.go
+++ b/core/services/relay/evm/exec_provider.go
@@ -23,6 +23,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/estimatorconfig"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/tokendata/usdc"
 )
 
@@ -40,6 +41,8 @@ type SrcExecProvider struct {
 	usdcAttestationAPIIntervalMilliseconds int
 	usdcSrcMsgTransmitterAddr              common.Address
 
+	feeEstimatorConfig estimatorconfig.FeeEstimatorConfigProvider
+
 	// these values are nil and are updated for Close()
 	seenOnRampAddress       *cciptypes.Address
 	seenSourceChainSelector *uint64
@@ -59,6 +62,7 @@ func NewSrcExecProvider(
 	usdcAttestationAPITimeoutSeconds int,
 	usdcAttestationAPIIntervalMilliseconds int,
 	usdcSrcMsgTransmitterAddr common.Address,
+	feeEstimatorConfig estimatorconfig.FeeEstimatorConfigProvider,
 ) (commontypes.CCIPExecProvider, error) {
 	var usdcReader *ccip.USDCReaderImpl
 	var err error
@@ -82,6 +86,7 @@ func NewSrcExecProvider(
 		usdcAttestationAPITimeoutSeconds:       usdcAttestationAPITimeoutSeconds,
 		usdcAttestationAPIIntervalMilliseconds: usdcAttestationAPIIntervalMilliseconds,
 		usdcSrcMsgTransmitterAddr:              usdcSrcMsgTransmitterAddr,
+		feeEstimatorConfig:                     feeEstimatorConfig,
 	}, nil
 }
 
@@ -163,7 +168,7 @@ func (s *SrcExecProvider) GetTransactionStatus(ctx context.Context, transactionI
 }
 
 func (s *SrcExecProvider) NewCommitStoreReader(ctx context.Context, addr cciptypes.Address) (commitStoreReader cciptypes.CommitStoreReader, err error) {
-	commitStoreReader = NewIncompleteSourceCommitStoreReader(s.estimator, s.maxGasPrice)
+	commitStoreReader = NewIncompleteSourceCommitStoreReader(s.estimator, s.maxGasPrice, s.feeEstimatorConfig)
 	return
 }
 
@@ -176,6 +181,10 @@ func (s *SrcExecProvider) NewOnRampReader(ctx context.Context, onRampAddress cci
 
 	versionFinder := ccip.NewEvmVersionFinder()
 	onRampReader, err = ccip.NewOnRampReader(s.lggr, versionFinder, sourceChainSelector, destChainSelector, onRampAddress, s.lp, s.client)
+	if err != nil {
+		return nil, err
+	}
+	s.feeEstimatorConfig.SetOnRampReader(onRampReader)
 	return
 }
 
@@ -236,6 +245,7 @@ type DstExecProvider struct {
 	configWatcher       *configWatcher
 	gasEstimator        gas.EvmFeeEstimator
 	maxGasPrice         big.Int
+	feeEstimatorConfig  estimatorconfig.FeeEstimatorConfigProvider
 	txm                 txmgr.TxManager
 	offRampAddress      cciptypes.Address
 
@@ -253,6 +263,7 @@ func NewDstExecProvider(
 	configWatcher *configWatcher,
 	gasEstimator gas.EvmFeeEstimator,
 	maxGasPrice big.Int,
+	feeEstimatorConfig estimatorconfig.FeeEstimatorConfigProvider,
 	txm txmgr.TxManager,
 	offRampAddress cciptypes.Address,
 ) (commontypes.CCIPExecProvider, error) {
@@ -266,6 +277,7 @@ func NewDstExecProvider(
 		configWatcher:       configWatcher,
 		gasEstimator:        gasEstimator,
 		maxGasPrice:         maxGasPrice,
+		feeEstimatorConfig:  feeEstimatorConfig,
 		txm:                 txm,
 		offRampAddress:      offRampAddress,
 	}, nil
@@ -295,10 +307,10 @@ func (d *DstExecProvider) Close() error {
 		if d.seenCommitStoreAddr == nil {
 			return nil
 		}
-		return ccip.CloseCommitStoreReader(d.lggr, versionFinder, *d.seenCommitStoreAddr, d.client, d.lp)
+		return ccip.CloseCommitStoreReader(d.lggr, versionFinder, *d.seenCommitStoreAddr, d.client, d.lp, d.feeEstimatorConfig)
 	})
 	unregisterFuncs = append(unregisterFuncs, func() error {
-		return ccip.CloseOffRampReader(d.lggr, versionFinder, d.offRampAddress, d.client, d.lp, nil, big.NewInt(0))
+		return ccip.CloseOffRampReader(d.lggr, versionFinder, d.offRampAddress, d.client, d.lp, nil, big.NewInt(0), d.feeEstimatorConfig)
 	})
 
 	var multiErr error
@@ -346,12 +358,12 @@ func (d *DstExecProvider) NewCommitStoreReader(ctx context.Context, addr cciptyp
 	d.seenCommitStoreAddr = &addr
 
 	versionFinder := ccip.NewEvmVersionFinder()
-	commitStoreReader, err = NewIncompleteDestCommitStoreReader(d.lggr, versionFinder, addr, d.client, d.lp)
+	commitStoreReader, err = NewIncompleteDestCommitStoreReader(d.lggr, versionFinder, addr, d.client, d.lp, d.feeEstimatorConfig)
 	return
 }
 
 func (d *DstExecProvider) NewOffRampReader(ctx context.Context, offRampAddress cciptypes.Address) (offRampReader cciptypes.OffRampReader, err error) {
-	offRampReader, err = ccip.NewOffRampReader(d.lggr, d.versionFinder, offRampAddress, d.client, d.lp, d.gasEstimator, &d.maxGasPrice, true)
+	offRampReader, err = ccip.NewOffRampReader(d.lggr, d.versionFinder, offRampAddress, d.client, d.lp, d.gasEstimator, &d.maxGasPrice, true, d.feeEstimatorConfig)
 	return
 }
 
diff --git a/core/services/synchronization/telem/telem_head_report.pb.go b/core/services/synchronization/telem/telem_head_report.pb.go
index 18e4532472..12801314a7 100644
--- a/core/services/synchronization/telem/telem_head_report.pb.go
+++ b/core/services/synchronization/telem/telem_head_report.pb.go
@@ -25,7 +25,7 @@ type HeadReportRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Chain     string `protobuf:"bytes,1,opt,name=chain,proto3" json:"chain,omitempty"`
+	ChainID   string `protobuf:"bytes,1,opt,name=chainID,proto3" json:"chainID,omitempty"`
 	Latest    *Block `protobuf:"bytes,2,opt,name=latest,proto3" json:"latest,omitempty"`
 	Finalized *Block `protobuf:"bytes,3,opt,name=finalized,proto3,oneof" json:"finalized,omitempty"`
 }
@@ -62,9 +62,9 @@ func (*HeadReportRequest) Descriptor() ([]byte, []int) {
 	return file_core_services_synchronization_telem_telem_head_report_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *HeadReportRequest) GetChain() string {
+func (x *HeadReportRequest) GetChainID() string {
 	if x != nil {
-		return x.Chain
+		return x.ChainID
 	}
 	return ""
 }
@@ -153,26 +153,27 @@ var file_core_services_synchronization_telem_telem_head_report_proto_rawDesc = [
 	0x73, 0x79, 0x6e, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f,
 	0x74, 0x65, 0x6c, 0x65, 0x6d, 0x2f, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x5f, 0x68, 0x65, 0x61, 0x64,
 	0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x74,
-	0x65, 0x6c, 0x65, 0x6d, 0x22, 0x8e, 0x01, 0x0a, 0x11, 0x48, 0x65, 0x61, 0x64, 0x52, 0x65, 0x70,
-	0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x68,
-	0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x68, 0x61, 0x69, 0x6e,
-	0x12, 0x24, 0x0a, 0x06, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x0c, 0x2e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x06,
-	0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69,
-	0x7a, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x74, 0x65, 0x6c, 0x65,
-	0x6d, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x00, 0x52, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c,
-	0x69, 0x7a, 0x65, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x66, 0x69, 0x6e, 0x61,
-	0x6c, 0x69, 0x7a, 0x65, 0x64, 0x22, 0x51, 0x0a, 0x05, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x1c,
-	0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x04, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x16, 0x0a, 0x06,
-	0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x6e, 0x75,
-	0x6d, 0x62, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x42, 0x4e, 0x5a, 0x4c, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x6b, 0x69, 0x74, 0x2f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
-	0x6b, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2f, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x6c, 0x65, 0x6d, 0x22, 0x92, 0x01, 0x0a, 0x11, 0x48, 0x65, 0x61, 0x64, 0x52, 0x65, 0x70,
+	0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68,
+	0x61, 0x69, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x68, 0x61,
+	0x69, 0x6e, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x06, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x2e, 0x42, 0x6c, 0x6f,
+	0x63, 0x6b, 0x52, 0x06, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x09, 0x66, 0x69,
+	0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e,
+	0x74, 0x65, 0x6c, 0x65, 0x6d, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x00, 0x52, 0x09, 0x66,
+	0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f,
+	0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x22, 0x51, 0x0a, 0x05, 0x42, 0x6c, 0x6f,
+	0x63, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
+	0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04,
+	0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x42, 0x4e, 0x5a, 0x4c,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6d, 0x61, 0x72, 0x74,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6b, 0x69, 0x74, 0x2f, 0x63, 0x68, 0x61, 0x69,
+	0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index e18abcf811..71ddf1c2c8 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -2813,7 +2813,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 FinalityDepth = 100
-FinalityTagEnabled = false
+FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
 LogPollInterval = '6s'
 LogKeepBlocksDepth = 100000
@@ -4130,7 +4130,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 FinalityDepth = 100
-FinalityTagEnabled = false
+FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
 LogPollInterval = '6s'
 LogKeepBlocksDepth = 100000
@@ -6666,7 +6666,7 @@ GasLimit = 5400000
 AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
-ChainType = 'metis'
+ChainType = 'optimismBedrock'
 FinalityDepth = 10
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
diff --git a/go.md b/go.md
index 697d6b52ce..d9ed0d0a66 100644
--- a/go.md
+++ b/go.md
@@ -28,8 +28,6 @@ flowchart LR
   click chain-selectors href "https://github.com/smartcontractkit/chain-selectors"
   chainlink/v2 --> chainlink-automation
   click chainlink-automation href "https://github.com/smartcontractkit/chainlink-automation"
-  chainlink/v2 --> chainlink-ccip
-  click chainlink-ccip href "https://github.com/smartcontractkit/chainlink-ccip"
   chainlink/v2 --> chainlink-common
   click chainlink-common href "https://github.com/smartcontractkit/chainlink-common"
   chainlink/v2 --> chainlink-cosmos
@@ -52,8 +50,6 @@ flowchart LR
   click wsrpc href "https://github.com/smartcontractkit/wsrpc"
   chainlink-automation --> chainlink-common
   chainlink-automation --> libocr
-  chainlink-ccip --> chainlink-common
-  chainlink-ccip --> libocr
   chainlink-common --> libocr
   chainlink-cosmos --> chainlink-common
   chainlink-cosmos --> libocr
diff --git a/go.mod b/go.mod
index 683793cb53..ee87e23f30 100644
--- a/go.mod
+++ b/go.mod
@@ -72,9 +72,8 @@ require (
 	github.com/scylladb/go-reflectx v1.0.1
 	github.com/shirou/gopsutil/v3 v3.24.3
 	github.com/shopspring/decimal v1.4.0
-	github.com/smartcontractkit/chain-selectors v1.0.21
+	github.com/smartcontractkit/chain-selectors v1.0.23
 	github.com/smartcontractkit/chainlink-automation v1.0.4
-	github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f
 	github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240718160222-2dc0c8136bfa
diff --git a/go.sum b/go.sum
index 5ad6772ecd..ac442571a9 100644
--- a/go.sum
+++ b/go.sum
@@ -1023,12 +1023,10 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/smartcontractkit/chain-selectors v1.0.21 h1:KCR9SA7PhOexaBzFieHoLv1WonwhVOPtOStpqTmLC4E=
-github.com/smartcontractkit/chain-selectors v1.0.21/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
+github.com/smartcontractkit/chain-selectors v1.0.23 h1:D2Eaex4Cw/O7Lg3tX6WklOqnjjIQAEBnutCtksPzVDY=
+github.com/smartcontractkit/chain-selectors v1.0.23/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
-github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f h1:lQZBOjeYFpCdk0mGQUhbrJipd00tu49xK4zSijC/9Co=
-github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f/go.mod h1:/ZWraCBaDDgaIN1prixYcbVvIk/6HeED9+8zbWQ+TMo=
 github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834 h1:pTf4xdcmiWBqWZ6rTy2RMTDBzhHk89VC1pM7jXKQztI=
 github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834/go.mod h1:fh9eBbrReCmv31bfz52ENCAMa7nTKQbdhb2B3+S2VGo=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 h1:NBQLtqk8zsyY4qTJs+NElI3aDFTcAo83JHvqD04EvB0=
diff --git a/integration-tests/actions/private_network.go b/integration-tests/actions/private_network.go
index 70239a6006..f10371d41a 100644
--- a/integration-tests/actions/private_network.go
+++ b/integration-tests/actions/private_network.go
@@ -4,6 +4,7 @@ import (
 	"github.com/rs/zerolog"
 
 	ctf_config "github.com/smartcontractkit/chainlink-testing-framework/config"
+	ctf_config_types "github.com/smartcontractkit/chainlink-testing-framework/config/types"
 	ctf_test_env "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 )
 
@@ -12,8 +13,8 @@ func EthereumNetworkConfigFromConfig(l zerolog.Logger, config ctf_config.GlobalT
 		l.Warn().Msg("No TOML private ethereum network config found, will use old geth")
 		ethBuilder := ctf_test_env.NewEthereumNetworkBuilder()
 		network, err = ethBuilder.
-			WithEthereumVersion(ctf_config.EthereumVersion_Eth1).
-			WithExecutionLayer(ctf_config.ExecutionLayer_Geth).
+			WithEthereumVersion(ctf_config_types.EthereumVersion_Eth1).
+			WithExecutionLayer(ctf_config_types.ExecutionLayer_Geth).
 			Build()
 
 		return
diff --git a/integration-tests/ccip-tests/Makefile b/integration-tests/ccip-tests/Makefile
index 5a40f7ca0f..8fdd635fd6 100644
--- a/integration-tests/ccip-tests/Makefile
+++ b/integration-tests/ccip-tests/Makefile
@@ -1,28 +1,27 @@
-## To Override the default config, and secret config:
-# example usage: make set_config override_toml=../config/config.toml secret_toml=../config/secret.toml network_config_toml=../config/network.toml
+## To Override the default config:
+# example usage: make set_config override_toml=../config/config.toml
 .PHONY: set_config
 set_config:
 	if [ -s "$(override_toml)" ]; then \
   			echo "Overriding config with $(override_toml)"; \
 			echo "export BASE64_CCIP_CONFIG_OVERRIDE=$$(base64 -i $(override_toml))" > ./testconfig/override/.env; \
         	echo "export TEST_BASE64_CCIP_CONFIG_OVERRIDE=$$(base64 -i $(override_toml))" >> ./testconfig/override/.env; \
+			echo "BASE64_CCIP_CONFIG_OVERRIDE=$$(base64 -i $(override_toml))" > ./testconfig/override/debug.env; \
+			echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$$(base64 -i $(override_toml))" >> ./testconfig/override/debug.env; \
     else \
       		echo "No override config found, using default config"; \
         	echo  > ./testconfig/override/.env; \
 	fi
-	if [ -s "$(network_config_toml)" ]; then \
-  	  echo "Overriding network config with $(network_config_toml)"; \
-      echo "export BASE64_NETWORK_CONFIG=$$(base64 -i $(network_config_toml))" >> ./testconfig/override/.env; \
-    fi
 
-	@echo "setting secret config with $(secret_toml)"
-	@echo "export BASE64_CCIP_SECRETS_CONFIG=$$(base64 -i $(secret_toml))" >> ./testconfig/override/.env
-	@echo "export TEST_BASE64_CCIP_SECRETS_CONFIG=$$(base64 -i $(secret_toml))" >> ./testconfig/override/.env
-	@echo "BASE64_CCIP_SECRETS_CONFIG=$$(base64 -i $(secret_toml))" > ./testconfig/override/debug.env
-	@echo "TEST_BASE64_CCIP_SECRETS_CONFIG=$$(base64 -i $(secret_toml))" >> ./testconfig/override/debug.env
+	@echo "Checking for test secrets file in ~/.testsecrets...";
+	@if [ ! -f ~/.testsecrets ]; then \
+		echo "WARNING: ~/.testsecrets file not found. No test secrets will be set. To set test secrets, refer to ./testconfig/examples/.testsecrets.example for the list of secrets and instruction how to set them up."; \
+	else \
+		echo "Test secrets will be loaded from ~/.testsecrets file."; \
+	fi	
 
 
-# example usage: make test_load_ccip testimage=chainlink-ccip-tests:latest testname=TestLoadCCIPStableRPS override_toml=./testconfig/override/config.toml secret_toml=./testconfig/tomls/secrets.toml network_config_toml=../config/network.toml
+# example usage: make test_load_ccip testimage=chainlink-ccip-tests:latest testname=TestLoadCCIPStableRPS override_toml=./testconfig/override/config.toml network_config_toml=../config/network.toml
 .PHONY: test_load_ccip
 test_load_ccip: set_config
 	source ./testconfig/override/.env && \
@@ -36,7 +35,7 @@ test_load_ccip: set_config
 	go test -timeout 24h -count=1 -v -run ^$(testname)$$ ./load
 
 
-# example usage: make test_smoke_ccip testimage=chainlink-ccip-tests:latest testname=TestSmokeCCIPForBidirectionalLane override_toml=../testconfig/override/config.toml secret_toml=./testconfig/tomls/secrets.toml network_config_toml=../config/network.toml
+# example usage: make test_smoke_ccip testimage=chainlink-ccip-tests:latest testname=TestSmokeCCIPForBidirectionalLane override_toml=../testconfig/override/config.toml network_config_toml=../config/network.toml
 .PHONY: test_smoke_ccip
 test_smoke_ccip: set_config
 	source ./testconfig/override/.env && \
@@ -48,7 +47,7 @@ test_smoke_ccip: set_config
 	go test -timeout 24h -count=1 -v -run ^$(testname)$$ ./smoke
 
 # run ccip smoke tests with default config; explicitly sets the override config to empty
-# example usage: make test_smoke_ccip_default testname=TestSmokeCCIPForBidirectionalLane secret_toml=./testconfig/tomls/secrets.toml
+# example usage: make test_smoke_ccip_default testname=TestSmokeCCIPForBidirectionalLane
 .PHONY: test_smoke_ccip_default
 test_smoke_ccip_default: set_config
 	source ./testconfig/override/.env && \
diff --git a/integration-tests/ccip-tests/README.md b/integration-tests/ccip-tests/README.md
index 0e000561fa..39b8360428 100644
--- a/integration-tests/ccip-tests/README.md
+++ b/integration-tests/ccip-tests/README.md
@@ -34,39 +34,12 @@ For example, if you want to override the `Network` input in test and want to run
         export BASE64_CCIP_CONFIG_OVERRIDE=$(base64 -i ./testconfig/override/mainnet.toml)
         ```
 
-3. Secrets - You also need to set some secrets. This is a mandatory step needed to run the tests. Please refer to [sample-secrets.toml](./testconfig/examples/secrets.toml.example) for the list of secrets that are mandatory to run the tests.
-   - The chainlink image and tag are required secrets for all the tests.
+3. Secrets - You also need to set some secrets. This is a mandatory step needed to run the tests. Please refer to [.testsecrets.example](./examples/.testsecrets.example) for the list of secrets and instruction how to set them up.
+   - The chainlink image is a required secret for all tests
    - If you are running tests in live networks like testnet and mainnet, you need to set the secrets (rpc urls and private keys) for the respective networks.
-   - If you are running tests in simulated networks no network specific secrets are required.
-   here is a sample secrets.toml file, for running the tests in simulated networks, with the chainlink image and tag set as secrets:
-
-   ```toml
-   [CCIP]
-   [CCIP.Env]
-   # ChainlinkImage is mandatory for all tests.
-   [CCIP.Env.NewCLCluster]
-   [CCIP.Env.NewCLCluster.Common]
-   [CCIP.Env.NewCLCluster.Common.ChainlinkImage]
-   image = "chainlink-ccip"
-   version = "latest"
-   ```
-
-   We consider secrets similar to test input overrides and encode them using `base64` command.
-   Once you have the secrets.toml file, you can encode it using `base64` command (similar to step 2) and set the env var `BASE64_CCIP_SECRETS_CONFIG` with the encoded content.
-
-    ```bash
-        export BASE64_CCIP_SECRETS_CONFIG=$(base64 -i ./testconfig/tomls/secrets.toml)
-    ```
 
 **Please note that the secrets should NOT be checked in to the repo and should be kept locally.**
 
-We recommend against changing the content of [sample-secrets.toml](./testconfig/examples/secrets.toml.example). Please create a new file and set it as the secrets file.
-You can run the command to ignore the changes to the file.
-
-```bash
-git update-index --skip-worktree <path-to-secrets-file>
-```
-
 ## Running the Tests
 
 There are two ways to run the tests:
diff --git a/integration-tests/ccip-tests/actions/ccip_helpers.go b/integration-tests/ccip-tests/actions/ccip_helpers.go
index e89f75baad..e878233d53 100644
--- a/integration-tests/ccip-tests/actions/ccip_helpers.go
+++ b/integration-tests/ccip-tests/actions/ccip_helpers.go
@@ -56,8 +56,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_offramp"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_onramp"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_onramp_1_2_0"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/mock_rmn_contract"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_contract"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/token_pool"
@@ -528,8 +528,8 @@ func (ccipModule *CCIPCommon) WaitForPriceUpdates(
 // of price update events and add the event details to watchers. It subscribes to 'UsdPerUnitGasUpdated'
 // and 'UsdPerTokenUpdated' event.
 func (ccipModule *CCIPCommon) WatchForPriceUpdates(ctx context.Context, lggr *zerolog.Logger) error {
-	gasUpdateEventLatest := make(chan *price_registry.PriceRegistryUsdPerUnitGasUpdated)
-	tokenUpdateEvent := make(chan *price_registry.PriceRegistryUsdPerTokenUpdated)
+	gasUpdateEventLatest := make(chan *fee_quoter.FeeQuoterUsdPerUnitGasUpdated)
+	tokenUpdateEvent := make(chan *fee_quoter.FeeQuoterUsdPerTokenUpdated)
 	sub := event.Resubscribe(DefaultResubscriptionTimeout, func(_ context.Context) (event.Subscription, error) {
 		lggr.Info().Msg("Subscribing to UsdPerUnitGasUpdated event")
 		eventSub, err := ccipModule.PriceRegistry.WatchUsdPerUnitGasUpdated(nil, gasUpdateEventLatest, nil)
@@ -4056,11 +4056,7 @@ func (c *CCIPTestEnv) ConnectToDeployedNodes() error {
 		}
 		c.CLNodes = chainlinkK8sNodes
 		if _, exists := c.K8Env.URLs[mockserver.InternalURLsKey]; exists {
-			mockServer, err := ctfClient.ConnectMockServer(c.K8Env)
-			if err != nil {
-				return fmt.Errorf("failed to connect to mock server: %w", err)
-			}
-			c.MockServer = mockServer
+			c.MockServer = ctfClient.ConnectMockServer(c.K8Env)
 		}
 	}
 	return nil
diff --git a/integration-tests/ccip-tests/contracts/contract_models.go b/integration-tests/ccip-tests/contracts/contract_models.go
index 26794816dd..9b59ce4008 100644
--- a/integration-tests/ccip-tests/contracts/contract_models.go
+++ b/integration-tests/ccip-tests/contracts/contract_models.go
@@ -27,13 +27,13 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_offramp_1_2_0"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_onramp"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_onramp_1_2_0"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/lock_release_token_pool"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/lock_release_token_pool_1_4_0"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/maybe_revert_message_receiver"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/mock_rmn_contract"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/mock_usdc_token_transmitter"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/mock_v3_aggregator_contract"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry_1_2_0"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_contract"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
@@ -1111,7 +1111,7 @@ type PriceRegistryUsdPerUnitGasUpdated struct {
 }
 
 type PriceRegistryWrapper struct {
-	Latest *price_registry.PriceRegistry
+	Latest *fee_quoter.FeeQuoter
 	V1_2_0 *price_registry_1_2_0.PriceRegistry
 }
 
@@ -1137,7 +1137,7 @@ func (p *PriceRegistryWrapper) AddPriceUpdater(opts *bind.TransactOpts, addr com
 	if p.Latest != nil {
 		return p.Latest.ApplyAuthorizedCallerUpdates(
 			opts,
-			price_registry.AuthorizedCallersAuthorizedCallerArgs{
+			fee_quoter.AuthorizedCallersAuthorizedCallerArgs{
 				AddedCallers:   []common.Address{addr},
 				RemovedCallers: []common.Address{},
 			},
@@ -1243,21 +1243,21 @@ func (c *PriceRegistry) UpdatePrices(tokenUpdates []InternalTokenPriceUpdate, ga
 	}
 	var tx *types.Transaction
 	if c.Instance.Latest != nil {
-		var tokenUpdatesLatest []price_registry.InternalTokenPriceUpdate
-		var gasUpdatesLatest []price_registry.InternalGasPriceUpdate
+		var tokenUpdatesLatest []fee_quoter.InternalTokenPriceUpdate
+		var gasUpdatesLatest []fee_quoter.InternalGasPriceUpdate
 		for _, update := range tokenUpdates {
-			tokenUpdatesLatest = append(tokenUpdatesLatest, price_registry.InternalTokenPriceUpdate{
+			tokenUpdatesLatest = append(tokenUpdatesLatest, fee_quoter.InternalTokenPriceUpdate{
 				SourceToken: update.SourceToken,
 				UsdPerToken: update.UsdPerToken,
 			})
 		}
 		for _, update := range gasUpdates {
-			gasUpdatesLatest = append(gasUpdatesLatest, price_registry.InternalGasPriceUpdate{
+			gasUpdatesLatest = append(gasUpdatesLatest, fee_quoter.InternalGasPriceUpdate{
 				DestChainSelector: update.DestChainSelector,
 				UsdPerUnitGas:     update.UsdPerUnitGas,
 			})
 		}
-		tx, err = c.Instance.Latest.UpdatePrices(opts, price_registry.InternalPriceUpdates{
+		tx, err = c.Instance.Latest.UpdatePrices(opts, fee_quoter.InternalPriceUpdates{
 			TokenPriceUpdates: tokenUpdatesLatest,
 			GasPriceUpdates:   gasUpdatesLatest,
 		})
@@ -1299,12 +1299,12 @@ func (c *PriceRegistry) UpdatePrices(tokenUpdates []InternalTokenPriceUpdate, ga
 	return c.client.ProcessTransaction(tx)
 }
 
-func (c *PriceRegistry) WatchUsdPerUnitGasUpdated(opts *bind.WatchOpts, latest chan *price_registry.PriceRegistryUsdPerUnitGasUpdated, destChain []uint64) (event.Subscription, error) {
+func (c *PriceRegistry) WatchUsdPerUnitGasUpdated(opts *bind.WatchOpts, latest chan *fee_quoter.FeeQuoterUsdPerUnitGasUpdated, destChain []uint64) (event.Subscription, error) {
 	if c.Instance.Latest != nil {
 		return c.Instance.Latest.WatchUsdPerUnitGasUpdated(opts, latest, destChain)
 	}
 	if c.Instance.V1_2_0 != nil {
-		newP, err := price_registry.NewPriceRegistry(c.Instance.V1_2_0.Address(), wrappers.MustNewWrappedContractBackend(c.client, nil))
+		newP, err := fee_quoter.NewFeeQuoter(c.Instance.V1_2_0.Address(), wrappers.MustNewWrappedContractBackend(c.client, nil))
 		if err != nil {
 			return nil, fmt.Errorf("failed to create new PriceRegistry contract: %w", err)
 		}
@@ -1313,12 +1313,12 @@ func (c *PriceRegistry) WatchUsdPerUnitGasUpdated(opts *bind.WatchOpts, latest c
 	return nil, fmt.Errorf("no instance found to watch for price updates for gas")
 }
 
-func (c *PriceRegistry) WatchUsdPerTokenUpdated(opts *bind.WatchOpts, latest chan *price_registry.PriceRegistryUsdPerTokenUpdated) (event.Subscription, error) {
+func (c *PriceRegistry) WatchUsdPerTokenUpdated(opts *bind.WatchOpts, latest chan *fee_quoter.FeeQuoterUsdPerTokenUpdated) (event.Subscription, error) {
 	if c.Instance.Latest != nil {
 		return c.Instance.Latest.WatchUsdPerTokenUpdated(opts, latest, nil)
 	}
 	if c.Instance.V1_2_0 != nil {
-		newP, err := price_registry.NewPriceRegistry(c.Instance.V1_2_0.Address(), wrappers.MustNewWrappedContractBackend(c.client, nil))
+		newP, err := fee_quoter.NewFeeQuoter(c.Instance.V1_2_0.Address(), wrappers.MustNewWrappedContractBackend(c.client, nil))
 		if err != nil {
 			return nil, fmt.Errorf("failed to create new PriceRegistry contract: %w", err)
 		}
diff --git a/integration-tests/ccip-tests/load/helper.go b/integration-tests/ccip-tests/load/helper.go
index 9522a6c346..dbb5ffc3e9 100644
--- a/integration-tests/ccip-tests/load/helper.go
+++ b/integration-tests/ccip-tests/load/helper.go
@@ -111,8 +111,15 @@ func (l *LoadArgs) scheduleForDest(destNetworkName string) []*wasp.Segment {
 	// if found, use that frequency for the destination network
 	// otherwise, use the default frequency
 	if l.TestCfg.TestGroupInput.LoadProfile.FrequencyByDestination != nil {
+		l.lggr.Debug().
+			Interface("FrequencyByDestination", l.TestCfg.TestGroupInput.LoadProfile.FrequencyByDestination).
+			Msg("LoadProfile provided")
 		for networkName, freq := range l.TestCfg.TestGroupInput.LoadProfile.FrequencyByDestination {
-			if strings.Contains(destNetworkName, networkName) {
+			l.lggr.Debug().Str("Destination", destNetworkName).Str("NetworkName", networkName).Msg("Checking frequency for destination")
+			if strings.EqualFold(destNetworkName, networkName) {
+				l.lggr.Info().Str("Destination", destNetworkName).
+					Ints64("RequestPerUnitTime", freq.RequestPerUnitTime).
+					Msg("Using frequency for destination")
 				return WaspSchedule(
 					freq.RequestPerUnitTime,
 					l.TestCfg.TestGroupInput.LoadProfile.TestDuration,
diff --git a/integration-tests/ccip-tests/testconfig/README.md b/integration-tests/ccip-tests/testconfig/README.md
index c32aee3d91..bcf468a36c 100644
--- a/integration-tests/ccip-tests/testconfig/README.md
+++ b/integration-tests/ccip-tests/testconfig/README.md
@@ -1,21 +1,23 @@
 # CCIP Configuration
 
-The CCIP configuration is used to specify the test configuration for running the CCIP integration tests. 
+The CCIP configuration is used to specify the test configuration for running the CCIP integration tests.
 The configuration is specified in a TOML file. The configuration is used to specify the test environment, test type, test parameters, and other necessary details for running the tests.
 The test config is read in following order:
-- The test reads the default configuration from [ccip-default.toml](./tomls/ccip-default.toml). 
-- The default can be overridden by specifying the test config in a separate file. 
-  - The file content needs to be encoded in base64 format and set in `BASE64_CCIP_CONFIG_OVERRIDE` environment variable. 
+
+- The test reads the default configuration from [ccip-default.toml](./tomls/ccip-default.toml).
+- The default can be overridden by specifying the test config in a separate file.
+  - The file content needs to be encoded in base64 format and set in `BASE64_CCIP_CONFIG_OVERRIDE` environment variable.
   - The config mentioned in this file will override the default config.
   - Example override file - [override.toml.example](./examples/override.toml.example)
-- If there are sensitive details like private keys, credentials in test config, they can be specified in a separate secret file. 
-  - The file content needs to be encoded in base64 format and set in `BASE64_CCIP_SECRETS_CONFIG` environment variable. 
-  - The config mentioned in this file will override the default and override config.
-  - Example secret file - [secrets.toml.example](./examples/secrets.toml.example)
+- If there are sensitive details like private keys, credentials in test config, they can be specified in a separate dotenv file as env vars
+  - The `~/.testsecrets` file in home directory is automatically loaded and should have all test secrets as env vars. Learn more about it [here](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/README.md#test-secrets) 
+  - Example secret file - [.testsecrets.example](./examples/.testsecrets.example)
 
 ## CCIP.ContractVersions
+
 Specifies contract versions of different contracts to be referred by test.
 Supported versions are:
+
 - **PriceRegistry**: '1.2.0', 'Latest'
 - **OffRamp**: '1.2.0', 'Latest'
 - **OnRamp**: '1.2.0', 'Latest'
@@ -23,6 +25,7 @@ Supported versions are:
 - **CommitStore**: '1.2.0', 'Latest'
 
 Example Usage:
+
 ```toml
 [CCIP.ContractVersions]
 PriceRegistry = "1.2.0"
@@ -33,14 +36,17 @@ CommitStore = "1.2.0"
 ```
 
 ## CCIP.Deployments
-CCIP Deployment contains all necessary contract addresses for various networks. This is mandatory if the test are to be run for [existing deployments](#ccipgroupstestgroupexistingdeployment) 
+
+CCIP Deployment contains all necessary contract addresses for various networks. This is mandatory if the test are to be run for [existing deployments](#ccipgroupstestgroupexistingdeployment)
 The deployment data can be specified -
- - Under `CCIP.Deployments.Data` field with value as stringify format of json. 
- - Under `CCIP.Deployments.DataFile` field with value as the path of the file containing the deployment data in json format.
+
+- Under `CCIP.Deployments.Data` field with value as stringify format of json.
+- Under `CCIP.Deployments.DataFile` field with value as the path of the file containing the deployment data in json format.
 
 The json schema is specified in https://github.com/smartcontractkit/ccip/blob/ccip-develop/integration-tests/ccip-tests/contracts/laneconfig/parse_contracts.go#L96
 
 Example Usage:
+
 ```toml
 [CCIP.Deployments]
 Data = """
@@ -96,32 +102,32 @@ Data = """
 }
 """
 ```
-Or 
+
+Or,
+
 ```toml
 [CCIP.Deployments]
 DataFile = '<path/to/deployment.json>'
 ```
 
 ## CCIP.Env 
+
 Specifies the environment details for the test to be run on.
 Mandatory fields are:
+
 - **Networks**: [CCIP.Env.Networks](#ccipenvnetworks)
 - **NewCLCluster**: [CCIP.Env.NewCLCluster](#ccipenvnewclcluster) - This is mandatory if the test needs to deploy Chainlink nodes.
 - **ExistingCLCluster**: [CCIP.Env.ExistingCLCluster](#ccipenvexistingclcluster) - This is mandatory if the test needs to run on existing Chainlink nodes to deploy ccip jobs.
 
-Test needs network/chain details to be set through configuration. This configuration is mandatory for running the tests.
-you have option to set the network details in two ways:
-1. Using [CCIP.Env.Networks](#ccipenvnetworks) 
-2. Using a separate network config file -
-   * refer to the example - [network_config.toml.example](./examples/network_config.toml.example)
-   * once all necessary values are set, encode the toml file content in base64 format,
-   * set the base64'ed string content in `BASE64_NETWORK_CONFIG` environment variable.
+Test needs network/chain details to be set through configuration. Set network urls in ~/.testsecrets [see docs](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/README.md#test-secrets).
 
 ### CCIP.Env.Networks
+
 Specifies the network details for the test to be run.
 The NetworkConfig is imported from https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/network.go#L39
 
 #### CCIP.Env.Networks.selected_networks
+
 It denotes the network names in which tests will be run. These networks are used to deploy ccip contracts and set up lanes between them.
 If more than 2 networks are specified, then lanes will be set up between all possible pairs of networks.
 
@@ -132,6 +138,7 @@ The name of the networks are taken from [known_networks](https://github.com/smar
 If the network is not present in known_networks, then the network details can be specified in the config file itself under the following `EVMNetworks` key.
 
 #### CCIP.Env.Network.EVMNetworks
+
 Specifies the network config to be used while creating blockchain EVMClient for test. 
 It is a map of network name to EVMNetworks where key is network name specified under `CCIP.Env.Networks.selected_networks` and value is `EVMNetwork`. 
 The EVMNetwork is imported from [EVMNetwork](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/blockchain/config.go#L43) in chainlink-testing-framework.
@@ -139,21 +146,24 @@ The EVMNetwork is imported from [EVMNetwork](https://github.com/smartcontractkit
 If `CCIP.Env.Network.EVMNetworks` config is not set for a network name specified under `CCIP.Env.Networks.selected_networks`, test will try to find the corresponding network config from defined networks in `MappedNetworks` under [known_networks.go](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/networks/known_networks.go)
 
 #### CCIP.Env.Network.AnvilConfigs
-If the test needs to run on chains created using Anvil, then the AnvilConfigs can be specified. 
-It is a map of network name to `AnvilConfig` where key is network name specified under `CCIP.Env.Networks.selected_networks` and value is `AnvilConfig`. 
-The AnvilConfig is imported from [AnvilConfig](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/network.go#L20) in chainlink-testing-framework.
 
+If the test needs to run on chains created using Anvil, then the AnvilConfigs can be specified.
+It is a map of network name to `AnvilConfig` where key is network name specified under `CCIP.Env.Networks.selected_networks` and value is `AnvilConfig`.
+The AnvilConfig is imported from [AnvilConfig](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/network.go#L20) in chainlink-testing-framework.
 
 **The following network configs are required for tests running on live networks. It can be ignored if the tests are running on simulated networks.**
 Refer to [secrets.toml.example](./examples/secrets.toml.example) for details.
 
 #### CCIP.ENV.Network.RpcHttpUrls
+
 RpcHttpUrls is the RPC HTTP endpoints for each network, key is the network name as declared in selected_networks slice.
 
 #### CCIP.ENV.Network.RpcWsUrls
+
 RpcWsUrls is the RPC WS endpoints for each network, key is the network name as declared in selected_networks slice.
 
 #### CCIP.ENV.Network.WalletKeys
+
 WalletKeys is the private keys for each network, key is the network name as declared in selected_networks slice.
 
 Example Usage of Network Config:
@@ -202,69 +212,95 @@ block_time = 1
 ```
 
 ### CCIP.Env.NewCLCluster
-The NewCLCluster config holds the overall deployment configuration for Chainlink nodes. 
+
+The NewCLCluster config holds the overall deployment configuration for Chainlink nodes.
 
 #### CCIP.Env.NewCLCluster.NoOfNodes
+
 Specifies the number of Chainlink nodes to be deployed.
 
 #### CCIP.Env.NewCLCluster.Common
+
 Specifies the common configuration for all Chainlink nodes if they share the same configuration.
-##### Name: 
+
+##### Name
+
 Name of the node.
-##### NeedsUpgrade: 
+
+##### NeedsUpgrade
+
 Indicates if the node needs an upgrade during test.
-##### ChainlinkImage:
+
+##### ChainlinkImage
+
 Configuration for the Chainlink image.
 
-##### ChainlinkUpgradeImage:
+##### ChainlinkUpgradeImage
+
 Configuration for the Chainlink upgrade image. It is used when the node needs an upgrade.
 
-##### BaseConfigTOML:
+##### BaseConfigTOML
+
 String containing the base configuration toml content for the Chainlink node config.
 
-##### CommonChainConfigTOML:
+##### CommonChainConfigTOML
+
 String containing the common chain configuration toml content for all EVMNodes in chainlink node config.
 
-##### ChainConfigTOMLByChain:
+##### ChainConfigTOMLByChain
+
 String containing the chain-specific configuration toml content for individual EVMNodes in chainlink node config. This is keyed by chain ID.
 
-##### DBImage:
+##### DBImage
+
 Database image for the Chainlink node.
 
-##### DBTag:
+##### DBTag
+
 Database tag/version for the Chainlink node.
 
 #### CCIP.Env.NewCLCluster.Nodes
+
 Specifies the configuration for individual nodes if they differ from the common configuration. The fields are the same as the common configuration.
 
 #### CCIP.Env.NewCLCluster.NodeMemory
+
 Specifies the memory to be allocated for each Chainlink node. This is valid only if the deployment is on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.NodeCPU
+
 Specifies the CPU to be allocated for each Chainlink node. This is valid only if the deployment is on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.DBMemory
+
 Specifies the memory to be allocated for the database. This is valid only if the deployment is on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.DBCPU
+
 Specifies the CPU to be allocated for the database. This is valid only if the deployment is on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.IsStateful
+
 Specifies whether the deployment is StatefulSet on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.DBStorageClass
+
 Specifies the storage class for the database. This is valid only if the deployment is StatefulSet on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.DBCapacity
+
 Specifies the capacity of the database. This is valid only if the deployment is StatefulSet on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.PromPgExporter
+
 Specifies whether to enable Prometheus PostgreSQL exporter. This is valid only if the deployment is on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.DBArgs
+
 Specifies the arguments to be passed to the database. This is valid only if the deployment is on Kubernetes.
 
 Example Usage:
+
 ```toml
 [CCIP.Env.NewCLCluster]
 NoOfNodes = 17
@@ -294,29 +330,42 @@ FeeCapDefault = '200 gwei'
 ```
 
 ### CCIP.Env.ExistingCLCluster
-The ExistingCLCluster config holds the overall connection configuration for existing Chainlink nodes. 
-It is needed when the tests are to be run on Chainlink nodes already deployed on some environment. 
-If this is specified, test will not need to connect to k8 namespace using [CCIP.Env.EnvToConnect](#ccipenvenvtoconnect) . 
+
+The ExistingCLCluster config holds the overall connection configuration for existing Chainlink nodes.
+It is needed when the tests are to be run on Chainlink nodes already deployed on some environment.
+If this is specified, test will not need to connect to k8 namespace using [CCIP.Env.EnvToConnect](#ccipenvenvtoconnect).
 Test can directly connect to the existing Chainlink nodes using node credentials without knowing the k8 namespace details.
 
 #### CCIP.Env.ExistingCLCluster.Name
+
 Specifies the name of the existing Chainlink cluster. This is used to identify the cluster in the test.
 
 #### CCIP.Env.ExistingCLCluster.NoOfNodes
+
 Specifies the number of Chainlink nodes in the existing cluster.
 
 #### CCIP.Env.ExistingCLCluster.NodeConfigs
+
 Specifies the configuration for individual nodes in the existing cluster. Each node config contains the following fields to connect to the Chainlink node:
+
 ##### CCIP.Env.ExistingCLCluster.NodeConfigs.URL
+
 The URL of the Chainlink node.
-##### CCIP.Env.ExistingCLCluster.NodeConfigs.Email 
+
+##### CCIP.Env.ExistingCLCluster.NodeConfigs.Email
+
 The username/email of the Chainlink node credential.
+
 ##### CCIP.Env.ExistingCLCluster.NodeConfigs.Password
+
 The password of the Chainlink node credential.
+
 ##### CCIP.Env.ExistingCLCluster.NodeConfigs.InternalIP
+
 The internal IP of the Chainlink node.
 
 Example Usage:
+
 ```toml
 [CCIP.Env.ExistingCLCluster]
 Name = 'crib-sample'
@@ -355,23 +404,30 @@ InternalIP = 'app-node-5'
 ```
 
 ### CCIP.Env.EnvToConnect
+
 This is specified when the test needs to connect to already existing k8s namespace. User needs to have access to the k8 namespace to run the tests through specific kubeconfig file.
 Example usage:
+
 ```toml
 [CCIP.Env]
 EnvToConnect="load-ccip-c8972"
 ```
+
 ### CCIP.ENV.TTL
+
 Specifies the time to live for the k8 namespace. This is used to terminate the namespace after the tests are run. This is only valid if the tests are run on k8s.
 Example usage:
+
 ```toml
 [CCIP.Env]
 TTL = "11h"
 ```
 
 ### CCIP.Env.Logging
+
 Specifies the logging configuration for the test. Imported from [LoggingConfig](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/logging.go#L11) in chainlink-testing-framework.
 Example usage:
+
 ```toml
 [CCIP.Env.Logging]
 test_log_collect = false # if set to true will save logs even if test did not fail
@@ -394,53 +450,67 @@ dashboard_url = "/d/6vjVx-1V8/ccip-long-running-tests"
 ```
 
 ### CCIP.Env.Lane.LeaderLaneEnabled
+
 Specifies whether to enable the leader lane feature. This setting is only applicable for new deployments.
 
 ## CCIP.Groups
+
 Specifies the test config specific to each test type. Available test types are:
+
 - **CCIP.Groups.load**
 - **CCIP.Groups.smoke**
 - **CCIP.Groups.chaos**
 
 ### CCIP.Groups.[testgroup].KeepEnvAlive
+
 Specifies whether to keep the k8 namespace alive after the test is run. This is only valid if the tests are run on k8s.
 
 ### CCIP.Groups.[testgroup].BiDirectionalLane
-Specifies whether to set up bi-directional lanes between networks. 
+
+Specifies whether to set up bi-directional lanes between networks.
 
 ### CCIP.Groups.[testgroup].CommitAndExecuteOnSameDON
+
 Specifies whether commit and execution jobs are to be run on the same Chainlink node.
 
 ### CCIP.Groups.[testgroup].NoOfCommitNodes
+
 Specifies the number of nodes on which commit jobs are to be run. This needs to be lesser than the total number of nodes mentioned in [CCIP.Env.NewCLCluster.NoOfNodes](#ccipenvnewclclusternoofnodes) or [CCIP.Env.ExistingCLCluster.NoOfNodes](#ccipenvexistingclclusternoofnodes).
 If the value of total nodes is `n`, then the max value of NoOfCommitNodes should be less than `n-1`. As the first node is used for bootstrap job.
 If the NoOfCommitNodes is lesser than `n-1`, then the remaining nodes are used for execution jobs if `CCIP.Groups.[testgroup].CommitAndExecuteOnSameDON` is set to false.
 
 ### CCIP.Groups.[testgroup].TokenConfig
+
 Specifies the token configuration for the test. The token configuration is used to set up tokens and token pools for all chains.
 
 #### CCIP.Groups.[testgroup].TokenConfig.NoOfTokensPerChain
+
 Specifies the number of tokens to be set up for each chain.
 
 #### CCIP.Groups.[testgroup].TokenConfig.WithPipeline
-Specifies whether to set up token pipelines in commit jobspec. If set to false, the token prices will be set with DynamicPriceGetterConfig. 
+
+Specifies whether to set up token pipelines in commit jobspec. If set to false, the token prices will be set with DynamicPriceGetterConfig.
 
 #### CCIP.Groups.[testgroup].TokenConfig.TimeoutForPriceUpdate
-Specifies the timeout to wait for token and gas price updates to be available in price registry for each chain. 
+
+Specifies the timeout to wait for token and gas price updates to be available in price registry for each chain.
 
 #### CCIP.Groups.[testgroup].TokenConfig.NoOfTokensWithDynamicPrice
+
 Specifies the number of tokens to be set up with dynamic price update. The rest of the tokens will be set up with static price. This is only valid if [WithPipeline](#ccipgroupstestgrouptokenconfigwithpipeline) is set to false.
 
 #### CCIP.Groups.[testgroup].TokenConfig.DynamicPriceUpdateInterval
+
 Specifies the interval for dynamic price update for tokens. This is only valid if [NoOfTokensWithDynamicPrice](#ccipgroupstestgrouptokenconfignooftokenswithdynamicprice) is set to value greater tha zero.
 
 #### CCIP.Groups.[testgroup].TokenConfig.CCIPOwnerTokens
+
 Specifies the tokens to be owned by the CCIP owner. If this is false, the tokens and pools will be owned by an address other than rest of CCIP contract admin addresses.
 This is applicable only if the contract versions are '1.5' or higher.
 
 Example Usage:
-```toml
 
+```toml
 [CCIP.Groups.load.TokenConfig]
 TimeoutForPriceUpdate = '15m'
 NoOfTokensPerChain = 60
@@ -450,27 +520,36 @@ CCIPOwnerTokens = true
 ```
 
 ### CCIP.Groups.[testgroup].MsgDetails
-Specifies the ccip message details to be sent by the test. 
+
+Specifies the ccip message details to be sent by the test.
+
 #### CCIP.Groups.[testgroup].MsgDetails.MsgType
+
 Specifies the type of message to be sent. The supported message types are:
+
 - **Token**
 - **Data**
 - **DataWithToken**
 
 #### CCIP.Groups.[testgroup].MsgDetails.DestGasLimit
+
 Specifies the gas limit for the destination chain. This is used to in `ExtraArgs` field of CCIPMessage. Change this to 0, if you are doing ccip-send to an EOA in the destination chain.
 
 #### CCIP.Groups.[testgroup].MsgDetails.DataLength
+
 Specifies the length of data to be sent in the message. This is only valid if [MsgType](#ccipgroupstestgroupmsgdetailsmsgtype) is set to 'Data' or 'DataWithToken'.
 
 #### CCIP.Groups.[testgroup].MsgDetails.NoOfTokens
+
 Specifies the number of tokens to be sent in the message. This is only valid if [MsgType](#ccipgroupstestgroupmsgdetailsmsgtype) is set to 'Token' or 'DataWithToken'.
 It needs to be less than or equal to [NoOfTokensPerChain](#ccipgroupstestgrouptokenconfignooftokensperchain) specified in the test config.
 
 #### CCIP.Groups.[testgroup].MsgDetails.TokenAmount
+
 Specifies the amount for each token to be sent in the message. This is only valid if [MsgType](#ccipgroupstestgroupmsgdetailsmsgtype) is set to 'Token' or 'DataWithToken'.
 
 Example Usage:
+
 ```toml
 [CCIP.Groups.smoke.MsgDetails]
 MsgType = 'DataWithToken' 
@@ -481,15 +560,19 @@ AmountPerToken = 1
 ```
 
 ### CCIP.Groups.[testgroup].MulticallInOneTx
+
 Specifies whether to send multiple ccip messages in a single transaction.
 
 ### CCIP.Groups.[testgroup].NoOfSendsInMulticall
+
 Specifies the number of ccip messages to be sent in a single transaction. This is only valid if [MulticallInOneTx](#ccipgroupstestgroupmulticallinonetx) is set to true.
 
 ### CCIP.Groups.[testgroup].PhaseTimeout
+
 The test validates various events in a ccip request lifecycle, like commit, execute, etc. This field specifies the timeout for each phase in the lifecycle.
 The timeout is calculated from the time the previous phase event is received.
 The following contract events are validated:
+
 - **CCIPSendRequested on OnRamp**
 - **CCIPSendRequested event log to be Finalized**
 - **ReportAccepted on CommitStore**
@@ -497,13 +580,16 @@ The following contract events are validated:
 - **ExecutionStateChanged on OffRamp**
 
 ### CCIP.Groups.[testgroup].LocalCluster
+
 Specifies whether the test is to be run on a local docker. If set to true, the test environment will be set up on a local docker.
 
 ### CCIP.Groups.[testgroup].ExistingDeployment
+
 Specifies whether the test is to be run on existing deployments. If set to true, the test will use the deployment data specified in [CCIP.Deployments](#ccipdeployments) for interacting with the ccip contracts.
 If the deployment data does not contain the required contract addresses, the test will fail.
 
 ### CCIP.Groups.[testgroup].ReuseContracts
+
 Test loads contract/lane config from [contracts.json](../contracts/laneconfig/contracts.json) if no lane config is specified in [CCIP.Deployments](#ccipdeployments)
 If a certain contract is present in the contracts.json, the test will use the contract address from the contracts.json.
 This field specifies whether to reuse the contracts from [contracts.json](../contracts/laneconfig/contracts.json)
@@ -511,58 +597,74 @@ For example if the contracts.json contains the contract address for PriceRegistr
 If `ReuseContracts` is set to false, the test will redeploy the contract instead of using the contract address from contracts.json.
 
 ### CCIP.Groups.[testgroup].NodeFunding
+
 Specified the native token funding for each Chainlink node. It assumes that the native token decimals is 18.
 The funding is done by the private key specified in [CCIP.Env.Networks](#ccipenvnetworks) for each network.
 The funding is done only if the test is run on local docker or k8s. This is not applicable for [existing deployments](#ccipgroupstestgroupexistingdeployment) is set to true.
 
 ### CCIP.Groups.[testgroup].NetworkPairs
-Specifies the network pairs for which the test is to be run. The test will set up lanes only between the specified network pairs. 
+
+Specifies the network pairs for which the test is to be run. The test will set up lanes only between the specified network pairs.
 If the network pairs are not specified, the test will set up lanes between all possible pairs of networks mentioned in selected_networks in [CCIP.Env.Networks](#ccipenvnetworksselectednetworks)
 
 ### CCIP.Groups.[testgroup].NoOfNetworks
-Specifies the number of networks to be used for the test. 
-If the number of networks is greater than the total number of networks specified in [CCIP.Env.Networks.selected_networks](#ccipenvnetworksselectednetworks) :
+
+Specifies the number of networks to be used for the test.
+If the number of networks is greater than the total number of networks specified in [CCIP.Env.Networks.selected_networks](#ccipenvnetworksselectednetworks):
+
 - the test will fail if the networks are live networks.
 - the test will create equal number of replicas of the first network with a new chain id if the networks are simulated networks. 
   For example, if the `selected_networks` is ['SIMULATED_1','SIMULATED_2'] and `NoOfNetworks` is 3, the test will create 1 more network config by copying the network config of `SIMULATED_1` with a different chain id and use that as 3rd network.
 
 ### CCIP.Groups.[testgroup].NoOfRoutersPerPair
+
 Specifies the number of routers to be set up for each network.
 
 ### CCIP.Groups.[testgroup].MaxNoOfLanes
+
 Specifies the maximum number of lanes to be set up between networks. If this values is not set, the test will set up lanes between all possible pairs of networks mentioned in `selected_networks` in [CCIP.Env.Networks](#ccipenvnetworksselectednetworks).
 For example, if `selected_networks = ['SIMULATED_1', 'SIMULATED_2', 'SIMULATED_3']`, and `MaxNoOfLanes` is set to 2, it denotes that the test will randomly select the 2 lanes between all possible pairs `SIMULATED_1`, `SIMULATED_2`, and `SIMULATED_3` for the test run.
 
 ### CCIP.Groups.[testgroup].DenselyConnectedNetworkChainIds
-This is applicable only if [MaxNoOfLanes](#ccipgroupstestgroupmaxnooflanes) is specified. 
+
+This is applicable only if [MaxNoOfLanes](#ccipgroupstestgroupmaxnooflanes) is specified.
 Specifies the chain ids for networks to be densely connected. If this is provided the test will include all possible pairs of networks mentioned in `DenselyConnectedNetworkChainIds`.
 The rest of the networks will be connected randomly based on the value of `MaxNoOfLanes`.
 
 ### CCIP.Groups.[testgroup].ChaosDuration
+
 Specifies the duration for which the chaos experiment is to be run. This is only valid if the test type is 'chaos'.
 
 ### CCIP.Groups.[testgroup].USDCMockDeployment
+
 Specifies whether to deploy USDC mock contract for the test. This is only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 The following fields are used for various parameters in OCR2 commit and execution jobspecs. All of these are only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
+
 ### CCIP.Groups.[testgroup].CommitOCRParams
+
 Specifies the OCR parameters for the commit job. This is only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 ### CCIP.Groups.[testgroup].ExecuteOCRParams
+
 Specifies the OCR parameters for the execute job. This is only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 ### CCIP.Groups.[testgroup].CommitInflightExpiry
+
 Specifies the value for the `InflightExpiry` in commit job's offchain config. This is only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 ### CCIP.Groups.[testgroup].OffRampConfig
+
 Specifies the offramp configuration for the execution job. This is only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 This is used to set values for following fields in execution jobspec's offchain and onchain config:
+
 - **OffRampConfig.MaxDataBytes**
 - **OffRampConfig.BatchGasLimit**
 - **OffRampConfig.InflightExpiry**
 - **OffRampConfig.RootSnooze**
 
 Example Usage:
+
 ```toml
 [CCIP.Groups.load]
 CommitInflightExpiry = '5m'
@@ -594,43 +696,53 @@ BatchGasLimit = 11000000
 MaxDataBytes = 1000
 InflightExpiry = '5m'
 RootSnooze = '5m'
-
 ```
 
 ### CCIP.Groups.[testgroup].StoreLaneConfig
+
 This is only valid if the tests are run on remote runners in k8s. If set to true, the test will store the lane config in the remote runner.
 
 ### CCIP.Groups.[testgroup].LoadProfile
-Specifies the load profile for the test. Only valid if the testgroup is 'load'. 
+
+Specifies the load profile for the test. Only valid if the testgroup is 'load'.
 
 ### CCIP.Groups.[testgroup].LoadProfile.LoadFrequency.[DestNetworkName]
 
 #### CCIP.Groups.[testgroup].LoadProfile.RequestPerUnitTime
+
 Specifies the number of requests to be sent per unit time. This is applicable to all networks if [LoadFrequency](#ccipgroupstestgrouploadprofileloadfrequencydestnetworkname) is not specified for a destination network.
 
 #### CCIP.Groups.[testgroup].LoadProfile.TimeUnit
+
 Specifies the unit of time for the load profile. This is applicable to all networks if [LoadFrequency](#ccipgroupstestgrouploadprofileloadfrequencydestnetworkname) is not specified for a destination network.
 
 #### CCIP.Groups.[testgroup].LoadProfile.StepDuration
+
 Specifies the duration for each step in the load profile. This is applicable to all networks if [LoadFrequency](#ccipgroupstestgrouploadprofileloadfrequencydestnetworkname) is not specified for a destination network.
 
 #### CCIP.Groups.[testgroup].LoadProfile.TestDuration
+
 Specifies the total duration for the load test.
 
 #### CCIP.Groups.[testgroup].LoadProfile.NetworkChaosDelay
+
 Specifies the duration network delay used for `NetworkChaos` experiment. This is only valid if the test is run on k8s and not on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 #### CCIP.Groups.[testgroup].LoadProfile.WaitBetweenChaosDuringLoad
+
 If there are multiple chaos experiments, this specifies the duration to wait between each chaos experiment. This is only valid if the test is run on k8s and not on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 #### CCIP.Groups.[testgroup].LoadProfile.SkipRequestIfAnotherRequestTriggeredWithin
+
 If a request is triggered within this duration, the test will skip sending another request during load run. For Example, if `SkipRequestIfAnotherRequestTriggeredWithin` is set to `40m`, and a request is triggered at 0th second, the test will skip sending another request for another 40m.
 This particular field is used to avoid sending multiple requests in a short duration during load run.
 
 #### CCIP.Groups.[testgroup].LoadProfile.OptimizeSpace
-This is used internally to optimize memory usage during load run. If set to true, after the initial lane set up is over the test will discard the lane config to save memory. 
-The test will only store contract addresses strictly necessary to trigger/validate ccip-send requests. 
+
+This is used internally to optimize memory usage during load run. If set to true, after the initial lane set up is over the test will discard the lane config to save memory.
+The test will only store contract addresses strictly necessary to trigger/validate ccip-send requests.
 Except for following contracts all other contract addresses will be discarded after the initial lane set up -
+
 - Router
 - ARM
 - CommitStore
@@ -638,37 +750,45 @@ Except for following contracts all other contract addresses will be discarded af
 - OnRamp
 
 #### CCIP.Groups.[testgroup].LoadProfile.FailOnFirstErrorInLoad
+
 If set to true, the test will fail on the first error encountered during load run. If set to false, the test will continue to run even if there are errors during load run.
 
 #### CCIP.Groups.[testgroup].LoadProfile.SendMaxDataInEveryMsgCount
-Specifies the number of requests to send with maximum data in every mentioned count iteration. 
+
+Specifies the number of requests to send with maximum data in every mentioned count iteration.
 For example, if `SendMaxDataInEveryMsgCount` is set to 5, the test will send ccip message with max allowable data length(as set in onRamp config) in every 5th request.
 
 #### CCIP.Groups.[testgroup].LoadProfile.TestRunName
+
 Specifies the name of the test run. This is used to identify the test run in CCIP test dashboard or logs. If multiple tests are run with same `TestRunName`, the test results will be aggregated under the same test run in grafana dashboard.
 This is used when multiple iterations of tests are run against same release version to aggregate the results under same dashboard view.
 
 #### CCIP.Groups.[testgroup].LoadProfile.MsgProfile
+
 Specifies the message profile for the test. The message profile is used to set up multiple ccip message details during load test.
 
 ##### CCIP.Groups.[testgroup].LoadProfile.MsgProfile.Frequencies
-Specifies the frequency of each message profile. 
+
+Specifies the frequency of each message profile.
 For example, if `Frequencies` is set to [1, 2, 3], the test will send 1st message profile 1 time, 2nd message profile 2 times, and 3rd message profile 3 times in each iteration. Each iteration will be defined by (1+2+3) = 6 requests.
 Example Breakdown:
+
 - Frequencies = [4, 12, 3, 1]
 - Total Sum of Frequencies = 4 + 12 + 3 + 1 = 20
 - Percentages:
-   - Message Type 1: (4 / 20) * 100% = 20%
-   - Message Type 2: (12 / 20) * 100% = 60%
-   - Message Type 3: (3 / 20) * 100% = 15%
-   - Message Type 4: (1 / 20) * 100% = 5%
+  - Message Type 1: (4 / 20) * 100% = 20%
+  - Message Type 2: (12 / 20) * 100% = 60%
+  - Message Type 3: (3 / 20) * 100% = 15%
+  - Message Type 4: (1 / 20) * 100% = 5%
  These percentages reflect how often each message type should appear in the total set of messages.
  Please note - if the total set of messages is not equal to the multiple of sum of frequencies, the percentages will not be accurate.
 
 ##### CCIP.Groups.[testgroup].LoadProfile.MsgProfile.MsgDetails
+
 Specifies the message details for each message profile. The fields are the same as [CCIP.Groups.[testgroup].MsgDetails](#ccipgroupstestgroupmsgdetails).
 
 example usage:
+
 ```toml
 # to represent 20%, 60%, 15%, 5% of the total messages
 [CCIP.Groups.load.LoadProfile.MsgProfile]
@@ -697,4 +817,4 @@ DataLength = 10000
 MsgType = 'Data'
 DestGasLimit = 2500000
 DataLength = 10000
-```
\ No newline at end of file
+```
diff --git a/integration-tests/ccip-tests/testconfig/ccip.go b/integration-tests/ccip-tests/testconfig/ccip.go
index 60d7055cb3..7d9419828e 100644
--- a/integration-tests/ccip-tests/testconfig/ccip.go
+++ b/integration-tests/ccip-tests/testconfig/ccip.go
@@ -387,6 +387,18 @@ type CCIP struct {
 	Groups           map[string]*CCIPTestGroupConfig              `toml:",omitempty"`
 }
 
+// LoadFromEnv loads selected env vars into the CCIP config
+func (c *CCIP) LoadFromEnv() error {
+	if c.Env == nil {
+		c.Env = &Common{}
+	}
+	err := c.Env.ReadFromEnvVar()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (c *CCIP) Validate() error {
 	if c.Env != nil {
 		err := c.Env.Validate()
diff --git a/integration-tests/ccip-tests/testconfig/examples/.testsecrets.example b/integration-tests/ccip-tests/testconfig/examples/.testsecrets.example
new file mode 100644
index 0000000000..e69ef9e854
--- /dev/null
+++ b/integration-tests/ccip-tests/testconfig/examples/.testsecrets.example
@@ -0,0 +1,39 @@
+# DO NOT UPDATE THIS FILE WITH ANY SECRET VALUES.
+# This file serves as a template for the actual ~/.testsecrets file. Follow these steps to use it:
+# 1. Create a copy of this template in your home directory under ~/.testsecrets
+# 2. Update ~/.testsecrets with actual secret values required for your tests. The file will be automatically loaded by the test framework
+# 3. Only include secrets necessary for the tests you are running. For example, if you are only running tests on Ethereum Mainnet, you do not need secrets for Base Mainnet. Comment other env vars.
+# DO NOT COMMIT THE ACTUAL SECRETS FILE TO THE REPOSITORY.
+
+# Chainlink image used for NewCLCluster
+E2E_TEST_CHAINLINK_IMAGE="***.dkr.ecr.***.amazonaws.com/chainlink-ccip"
+
+# Chainlink upgrade image for NewCLCluster. Used only for upgrade tests
+E2E_TEST_CHAINLINK_UPGRADE_IMAGE="***.dkr.ecr.***.amazonaws.com/chainlink-ccip"
+
+# Ethereum network secrets
+E2E_TEST_ETHEREUM_MAINNET_WALLET_KEY="<private key for ethereum network>"
+E2E_TEST_ETHEREUM_MAINNET_RPC_HTTP_URL="<http url 0 for ethereum network>"
+E2E_TEST_ETHEREUM_MAINNET_RPC_HTTP_URL_1="<http url 1 for ethereum network>"
+E2E_TEST_ETHEREUM_MAINNET_RPC_WS_URL="<ws ws 0 for ethereum network>"
+E2E_TEST_ETHEREUM_MAINNET_RPC_WS_URL_1="<ws ws 1 for ethereum network>"
+
+# Base network secrets
+E2E_TEST_BASE_MAINNET_WALLET_KEY="<private key for base network>"
+E2E_TEST_BASE_MAINNET_RPC_HTTP_URL="<http url 0 for base network>"
+E2E_TEST_BASE_MAINNET_RPC_HTTP_URL_1="<http url 1 for base network>"
+E2E_TEST_BASE_MAINNET_RPC_WS_URL="<ws ws 0 for base network>"
+E2E_TEST_BASE_MAINNET_RPC_WS_URL_1="<ws ws 1 for base network>"
+
+# Other networks secrets (pattern for envs)
+# E2E_TEST_(.+)_WALLET_KEY_(\d+)="<i-th wallet key for (.+) network>"
+# E2E_TEST_(.+)_RPC_HTTP_URL_(\d+)="<i-th http url for (.+) network>"
+# E2E_TEST_(.+)_RPC_WS_URL_(\d+)="<i-th ws url for (.+) network>"
+
+# Loki secrets
+E2E_TEST_LOKI_TENANT_ID="<tenant id for loki>"
+E2E_TEST_LOKI_ENDPOINT="<url for loki>"
+
+# Grafana secrets
+E2E_TEST_GRAFANA_BASE_URL="<url for grafana>"
+E2E_TEST_GRAFANA_DASHBOARD_URL="/d/6vjVx-1V8/ccip-long-running-tests"
diff --git a/integration-tests/ccip-tests/testconfig/examples/network_config.toml.example b/integration-tests/ccip-tests/testconfig/examples/network_config.toml.example
deleted file mode 100644
index ffed99a771..0000000000
--- a/integration-tests/ccip-tests/testconfig/examples/network_config.toml.example
+++ /dev/null
@@ -1,168 +0,0 @@
-[RpcHttpUrls]
-ETHEREUM_MAINNET = [
-    'https:....',
-    'https:......',
-]
-AVALANCHE_MAINNET = [
-    'https:....',
-    'https:......',
-]
-BASE_MAINNET = [
-    'https:....',
-    'https:......',
-]
-ARBITRUM_MAINNET = [
-    'https:....',
-    'https:......',
-]
-BSC_MAINNET = [
-    'https:....',
-    'https:......',
-]
-OPTIMISM_MAINNET = [
-    'https:....',
-    'https:......',
-]
-POLYGON_MAINNET = [
-    'https:....',
-    'https:......',
-]
-WEMIX_MAINNET = [
-    'https:....',
-    'https:......',
-]
-KROMA_MAINNET = [
-    'https:....',
-    'https:......',
-]
-
-OPTIMISM_SEPOLIA = [
-    'https:....',
-    'https:......',
-]
-SEPOLIA = [
-    'https:....',
-    'https:......',
-]
-AVALANCHE_FUJI = [
-    'https:....',
-    'https:......',
-]
-ARBITRUM_SEPOLIA = [
-    'https:....',
-    'https:......',
-]
-POLYGON_MUMBAI = [
-    'https:....',
-    'https:......',
-]
-BASE_SEPOLIA = [
-    'https:....',
-    'https:......',
-]
-BSC_TESTNET = [
-    'https:....',
-    'https:......',
-]
-KROMA_SEPOLIA = [
-    'https:....',
-    'https:......',
-]
-WEMIX_TESTNET = [
-    'https:....',
-    'https:......',
-]
-
-[RpcWsUrls]
-ETHEREUM_MAINNET = [
-    'wss://......',
-    'wss://.........'
-]
-AVALANCHE_MAINNET = [
-    'wss://......',
-    'wss://.........'
-]
-BASE_MAINNET = [
-    'wss://......',
-    'wss://.........'
-]
-ARBITRUM_MAINNET = [
-    'wss://......',
-    'wss://.........'
-]
-BSC_MAINNET = [
-    'wss://......',
-    'wss://.........'
-]
-POLYGON_MAINNET = [
-    'wss://......',
-    'wss://.........'
-]
-OPTIMISM_MAINNET = [
-    'wss://......',
-    'wss://.........'
-]
-WEMIX_MAINNET = [
-    'wss://......',
-    'wss://.........'
-]
-KROMA_MAINNET = [
-    'wss://......',
-    'wss://.........'
-]
-OPTIMISM_SEPOLIA = [
-    'wss://......',
-    'wss://.........'
-]
-SEPOLIA = [
-    'wss://......',
-    'wss://.........'
-]
-AVALANCHE_FUJI = [
-    'wss://......',
-    'wss://.........'
-]
-ARBITRUM_SEPOLIA = [
-    'wss://......',
-    'wss://.........'
-]
-POLYGON_MUMBAI = [
-    'wss://......',
-    'wss://.........'
-]
-BASE_SEPOLIA = [
-    'wss://......',
-    'wss://.........'
-]
-BSC_TESTNET = [
-    'wss://......',
-    'wss://.........'
-]
-KROMA_SEPOLIA = [
-    'wss://......',
-    'wss://.........'
-]
-WEMIX_TESTNET = [
-    'wss://......',
-    'wss://.........'
-]
-
-[WalletKeys]
-ETHEREUM_MAINNET = ['<your private key goes here>']
-AVALANCHE_MAINNET = ['<your private key goes here>']
-BASE_MAINNET = ['<your private key goes here>']
-ARBITRUM_MAINNET = ['<your private key goes here>']
-BSC_MAINNET = ['<your private key goes here>']
-POLYGON_MAINNET = ['<your private key goes here>']
-OPTIMISM_MAINNET = ['<your private key goes here>']
-WEMIX_MAINNET = ['<your private key goes here>']
-KROMA_MAINNET = ['<your private key goes here>']
-OPTIMISM_SEPOLIA = ['<your private key goes here>']
-SEPOLIA = ['<your private key goes here>']
-AVALANCHE_FUJI = ['<your private key goes here>']
-ARBITRUM_SEPOLIA = ['<your private key goes here>']
-POLYGON_MUMBAI = ['<your private key goes here>']
-BASE_SEPOLIA = ['<your private key goes here>']
-BSC_TESTNET = ['<your private key goes here>']
-KROMA_SEPOLIA = ['<your private key goes here>']
-WEMIX_TESTNET = ['<your private key goes here>']
\ No newline at end of file
diff --git a/integration-tests/ccip-tests/testconfig/examples/secrets.toml.example b/integration-tests/ccip-tests/testconfig/examples/secrets.toml.example
deleted file mode 100644
index 3045f51759..0000000000
--- a/integration-tests/ccip-tests/testconfig/examples/secrets.toml.example
+++ /dev/null
@@ -1,52 +0,0 @@
-# This file contains all secret parameters for ccip tests.
-# DO NOT UPDATE THIS FILE WITH ANY SECRET VALUES.
-# Use this file as a template for the actual secret file and update all the parameter values accordingly.
-# DO NOT COMMIT THE ACTUAL SECRET FILE TO THE REPOSITORY.
-[CCIP]
-[CCIP.Env]
-
-# ChainlinkImage is mandatory for all tests.
-[CCIP.Env.NewCLCluster]
-[CCIP.Env.NewCLCluster.Common]
-[CCIP.Env.NewCLCluster.Common.ChainlinkImage]
-image = "chainlink-ccip"
-version = "latest"
-
-# Chainlink upgrade image is used only for upgrade tests
-#[CCIP.Env.NewCLCluster.Common.ChainlinkUpgradeImage]
-#image = "***.dkr.ecr.***.amazonaws.com/chainlink-ccip"
-#version = "****"
-
-
-# Networks configuration with rpc urls and wallet keys are mandatory only for tests running on live networks
-# The following example is for 3 networks: Ethereum, Base and Arbitrum
-# Network configuration can be ignored for tests running on simulated/private networks
-[CCIP.Env.Network]
-selected_networks= [
-    'ETHEREUM_MAINNET','BASE_MAINNET', 'ARBITRUM_MAINNET',
-]
-
-[CCIP.Env.Network.RpcHttpUrls]
-ETHEREUM_MAINNET = ['<https for ethereum network>', '<https for ethereum network>']
-BASE_MAINNET = ['<https for base network>', '<https for base network>']
-ARBITRUM_MAINNET = ['<https for arbitrum network>', '<https for arbitrum network>']
-
-[CCIP.Env.Network.RpcWsUrls]
-ETHEREUM_MAINNET = ['<wss for ethereum network>', '<wss for ethereum network>']
-BASE_MAINNET = ['<wss for base network>', '<wss for base network>']
-ARBITRUM_MAINNET = ['<wss for arbitrum network>', '<wss for arbitrum network>']
-
-[CCIP.Env.Network.WalletKeys]
-ETHEREUM_MAINNET = ['<private key for ethereum network>']
-BASE_MAINNET = ['<private key for base network>']
-ARBITRUM_MAINNET = ['<private key for arbitrum network>']
-
-# Used for tests using 1. loki logging for test results.
-# Mandatory for load tests
-[CCIP.Env.Logging.Loki]
-tenant_id="<tenant id for loki>"
-endpoint="<url for loki>"
-
-[CCIP.Env.Logging.Grafana]
-base_url="<url for grafana>"
-dashboard_url="/d/6vjVx-1V8/ccip-long-running-tests"
diff --git a/integration-tests/ccip-tests/testconfig/global.go b/integration-tests/ccip-tests/testconfig/global.go
index 331737c5fb..a1658a4841 100644
--- a/integration-tests/ccip-tests/testconfig/global.go
+++ b/integration-tests/ccip-tests/testconfig/global.go
@@ -15,6 +15,7 @@ import (
 	"github.com/smartcontractkit/seth"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
+	"github.com/smartcontractkit/chainlink-testing-framework/logging"
 	"github.com/smartcontractkit/chainlink-testing-framework/networks"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
@@ -29,7 +30,6 @@ import (
 const (
 	OVERIDECONFIG = "BASE64_CCIP_CONFIG_OVERRIDE"
 
-	SECRETSCONFIG             = "BASE64_CCIP_SECRETS_CONFIG"
 	ErrReadConfig             = "failed to read TOML config"
 	ErrUnmarshalConfig        = "failed to unmarshal TOML config"
 	Load               string = "load"
@@ -105,52 +105,46 @@ func EncodeConfigAndSetEnv(c any, envVar string) (string, error) {
 func NewConfig() (*Config, error) {
 	cfg := &Config{}
 	var override *Config
-	var secrets *Config
+	// var secrets *Config
 	// load config from default file
 	err := config.DecodeTOML(bytes.NewReader(DefaultConfig), cfg)
 	if err != nil {
 		return nil, errors.Wrap(err, ErrReadConfig)
 	}
 
-	// load config from env var if specified
-	rawConfig, _ := osutil.GetEnv(OVERIDECONFIG)
-	if rawConfig != "" {
-		err = DecodeConfig(rawConfig, &override)
-		if err != nil {
-			return nil, fmt.Errorf("failed to decode override config: %w", err)
-		}
-	}
-	if override != nil {
-		// apply overrides for all products
-		if override.CCIP != nil {
-			if cfg.CCIP == nil {
-				cfg.CCIP = override.CCIP
-			} else {
-				err = cfg.CCIP.ApplyOverrides(override.CCIP)
-				if err != nil {
-					return nil, err
+	// load config overrides from env var if specified
+	// there can be multiple overrides separated by comma
+	rawConfigs, _ := osutil.GetEnv(OVERIDECONFIG)
+	if rawConfigs != "" {
+		for _, rawConfig := range strings.Split(rawConfigs, ",") {
+			err = DecodeConfig(rawConfig, &override)
+			if err != nil {
+				return nil, fmt.Errorf("failed to decode override config: %w", err)
+			}
+			if override != nil {
+				// apply overrides for all products
+				if override.CCIP != nil {
+					if cfg.CCIP == nil {
+						cfg.CCIP = override.CCIP
+					} else {
+						err = cfg.CCIP.ApplyOverrides(override.CCIP)
+						if err != nil {
+							return nil, err
+						}
+					}
 				}
 			}
 		}
 	}
 	// read secrets for all products
 	if cfg.CCIP != nil {
-		// load config from env var if specified for secrets
-		secretRawConfig, _ := osutil.GetEnv(SECRETSCONFIG)
-		if secretRawConfig != "" {
-			err = DecodeConfig(secretRawConfig, &secrets)
-			if err != nil {
-				return nil, fmt.Errorf("failed to decode secrets config: %w", err)
-			}
-			if secrets != nil {
-				// apply secrets for all products
-				if secrets.CCIP != nil {
-					err = cfg.CCIP.ApplyOverrides(secrets.CCIP)
-					if err != nil {
-						return nil, fmt.Errorf("failed to apply secrets: %w", err)
-					}
-				}
-			}
+		err := ctfconfig.LoadSecretEnvsFromFiles()
+		if err != nil {
+			return nil, errors.Wrap(err, "error loading testsecrets files")
+		}
+		err = cfg.CCIP.LoadFromEnv()
+		if err != nil {
+			return nil, errors.Wrap(err, "error loading env vars into CCIP config")
 		}
 		// validate all products
 		err = cfg.CCIP.Validate()
@@ -176,6 +170,156 @@ type Common struct {
 	Logging                 *ctfconfig.LoggingConfig                    `toml:",omitempty"`
 }
 
+// ReadFromEnvVar loads selected env vars into the config
+func (p *Common) ReadFromEnvVar() error {
+	logger := logging.GetTestLogger(nil)
+
+	lokiTenantID := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_LOKI_TENANT_ID_ENV)
+	if lokiTenantID != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Loki == nil {
+			p.Logging.Loki = &ctfconfig.LokiConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Loki.TenantId", ctfconfig.E2E_TEST_LOKI_TENANT_ID_ENV)
+		p.Logging.Loki.TenantId = &lokiTenantID
+	}
+
+	lokiEndpoint := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_LOKI_ENDPOINT_ENV)
+	if lokiEndpoint != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Loki == nil {
+			p.Logging.Loki = &ctfconfig.LokiConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Loki.Endpoint", ctfconfig.E2E_TEST_LOKI_ENDPOINT_ENV)
+		p.Logging.Loki.Endpoint = &lokiEndpoint
+	}
+
+	lokiBasicAuth := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_LOKI_BASIC_AUTH_ENV)
+	if lokiBasicAuth != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Loki == nil {
+			p.Logging.Loki = &ctfconfig.LokiConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Loki.BasicAuth", ctfconfig.E2E_TEST_LOKI_BASIC_AUTH_ENV)
+		p.Logging.Loki.BasicAuth = &lokiBasicAuth
+	}
+
+	lokiBearerToken := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_LOKI_BEARER_TOKEN_ENV)
+	if lokiBearerToken != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Loki == nil {
+			p.Logging.Loki = &ctfconfig.LokiConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Loki.BearerToken", ctfconfig.E2E_TEST_LOKI_BEARER_TOKEN_ENV)
+		p.Logging.Loki.BearerToken = &lokiBearerToken
+	}
+
+	grafanaBaseUrl := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_GRAFANA_BASE_URL_ENV)
+	if grafanaBaseUrl != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Grafana == nil {
+			p.Logging.Grafana = &ctfconfig.GrafanaConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Grafana.BaseUrl", ctfconfig.E2E_TEST_GRAFANA_BASE_URL_ENV)
+		p.Logging.Grafana.BaseUrl = &grafanaBaseUrl
+	}
+
+	grafanaDashboardUrl := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_GRAFANA_DASHBOARD_URL_ENV)
+	if grafanaDashboardUrl != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Grafana == nil {
+			p.Logging.Grafana = &ctfconfig.GrafanaConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Grafana.DashboardUrl", ctfconfig.E2E_TEST_GRAFANA_DASHBOARD_URL_ENV)
+		p.Logging.Grafana.DashboardUrl = &grafanaDashboardUrl
+	}
+
+	grafanaBearerToken := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_GRAFANA_BEARER_TOKEN_ENV)
+	if grafanaBearerToken != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Grafana == nil {
+			p.Logging.Grafana = &ctfconfig.GrafanaConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Grafana.BearerToken", ctfconfig.E2E_TEST_GRAFANA_BEARER_TOKEN_ENV)
+		p.Logging.Grafana.BearerToken = &grafanaBearerToken
+	}
+
+	walletKeys := ctfconfig.ReadEnvVarGroupedMap(ctfconfig.E2E_TEST_WALLET_KEY_ENV, ctfconfig.E2E_TEST_WALLET_KEYS_ENV)
+	if len(walletKeys) > 0 {
+		if p.Network == nil {
+			p.Network = &ctfconfig.NetworkConfig{}
+		}
+		logger.Debug().Msgf("Using %s and/or %s env vars to override Network.WalletKeys", ctfconfig.E2E_TEST_WALLET_KEY_ENV, ctfconfig.E2E_TEST_WALLET_KEYS_ENV)
+		p.Network.WalletKeys = walletKeys
+	}
+
+	rpcHttpUrls := ctfconfig.ReadEnvVarGroupedMap(ctfconfig.E2E_TEST_RPC_HTTP_URL_ENV, ctfconfig.E2E_TEST_RPC_HTTP_URLS_ENV)
+	if len(rpcHttpUrls) > 0 {
+		if p.Network == nil {
+			p.Network = &ctfconfig.NetworkConfig{}
+		}
+		logger.Debug().Msgf("Using %s and/or %s env vars to override Network.RpcHttpUrls", ctfconfig.E2E_TEST_RPC_HTTP_URL_ENV, ctfconfig.E2E_TEST_RPC_HTTP_URLS_ENV)
+		p.Network.RpcHttpUrls = rpcHttpUrls
+	}
+
+	rpcWsUrls := ctfconfig.ReadEnvVarGroupedMap(ctfconfig.E2E_TEST_RPC_WS_URL_ENV, ctfconfig.E2E_TEST_RPC_WS_URLS_ENV)
+	if len(rpcWsUrls) > 0 {
+		if p.Network == nil {
+			p.Network = &ctfconfig.NetworkConfig{}
+		}
+		logger.Debug().Msgf("Using %s and/or %s env vars to override Network.RpcWsUrls", ctfconfig.E2E_TEST_RPC_WS_URL_ENV, ctfconfig.E2E_TEST_RPC_WS_URLS_ENV)
+		p.Network.RpcWsUrls = rpcWsUrls
+	}
+
+	chainlinkImage := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_CHAINLINK_IMAGE_ENV)
+	if chainlinkImage != "" {
+		if p.NewCLCluster == nil {
+			p.NewCLCluster = &ChainlinkDeployment{}
+		}
+		if p.NewCLCluster.Common == nil {
+			p.NewCLCluster.Common = &Node{}
+		}
+		if p.NewCLCluster.Common.ChainlinkImage == nil {
+			p.NewCLCluster.Common.ChainlinkImage = &ctfconfig.ChainlinkImageConfig{}
+		}
+
+		logger.Debug().Msgf("Using %s env var to override NewCLCluster.Common.ChainlinkImage.Image", ctfconfig.E2E_TEST_CHAINLINK_IMAGE_ENV)
+		p.NewCLCluster.Common.ChainlinkImage.Image = &chainlinkImage
+	}
+
+	chainlinkUpgradeImage := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_CHAINLINK_UPGRADE_IMAGE_ENV)
+	if chainlinkUpgradeImage != "" {
+		if p.NewCLCluster == nil {
+			p.NewCLCluster = &ChainlinkDeployment{}
+		}
+		if p.NewCLCluster.Common == nil {
+			p.NewCLCluster.Common = &Node{}
+		}
+		if p.NewCLCluster.Common.ChainlinkUpgradeImage == nil {
+			p.NewCLCluster.Common.ChainlinkUpgradeImage = &ctfconfig.ChainlinkImageConfig{}
+		}
+
+		logger.Debug().Msgf("Using %s env var to override NewCLCluster.Common.ChainlinkUpgradeImage.Image", ctfconfig.E2E_TEST_CHAINLINK_UPGRADE_IMAGE_ENV)
+		p.NewCLCluster.Common.ChainlinkUpgradeImage.Image = &chainlinkUpgradeImage
+	}
+
+	return nil
+}
+
 func (p *Common) GetNodeConfig() *ctfconfig.NodeConfig {
 	return &ctfconfig.NodeConfig{
 		BaseConfigTOML:           p.NewCLCluster.Common.BaseConfigTOML,
diff --git a/integration-tests/ccip-tests/testconfig/tomls/ccip-default.toml b/integration-tests/ccip-tests/testconfig/tomls/ccip-default.toml
index 77dc97f77f..076c334e07 100644
--- a/integration-tests/ccip-tests/testconfig/tomls/ccip-default.toml
+++ b/integration-tests/ccip-tests/testconfig/tomls/ccip-default.toml
@@ -229,6 +229,10 @@ BlockHistorySize = 200
 EIP1559FeeCapBufferBlocks = 0
 """
 
+# Run by default using latest version from `ccip-develop` branch, override this value to use a specific version
+[CCIP.Env.NewCLCluster.Common.ChainlinkImage]
+version = "ccip-develop"
+
 # the following configs are specific to each test type, smoke, load , chaos, etc...
 [CCIP.Groups]
 [CCIP.Groups.smoke]
diff --git a/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/baseline.toml b/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/baseline.toml
index 02ca2f4d9f..c404d3a0c0 100644
--- a/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/baseline.toml
+++ b/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/baseline.toml
@@ -7,8 +7,15 @@
 ##
 ## make test_load_ccip testimage=<aws account number>.dkr.ecr.<aws region>.amazonaws.com/chainlink-ccip-tests:ccip-develop  \
 ##      testname=TestLoadCCIPStableRequestTriggeringWithNetworkChaos \
-##      override_toml=./testconfig/tomls/ccip-1.4-stress/baseline.toml \
-##      secret_toml=./testconfig/tomls/secrets.toml
+##      override_toml=./testconfig/tomls/ccip-1.4-stress/baseline.toml
+
+## Adjust this value depending on what you want to test.
+# Using releases and git tag requires changing the image name to the correct one in `~/.testsecrets`, e.g.
+# E2E_TEST_CHAINLINK_IMAGE="public.ecr.aws/w0i8p0z9/chainlink-ccip"
+# If you want to use a specific commit or a branch you need to switch to the internal ECR in `~/.testsecrets`
+# E2E_TEST_CHAINLINK_IMAGE="<aws account number>.dkr.ecr.<aws region>.amazonaws.com/chainlink-ccip"
+[CCIP.Env.NewCLCluster.Common.ChainlinkImage]
+version = "2.14.0-ccip1.5.0"
 
 [CCIP]
 [CCIP.ContractVersions]
@@ -22,7 +29,7 @@ CommitStore = '1.2.0'
 TTL = '10h'
 
 [CCIP.Env.Network]
-selected_networks= ['PRIVATE-CHAIN-1', 'PRIVATE-CHAIN-2']
+selected_networks = ['PRIVATE-CHAIN-1', 'PRIVATE-CHAIN-2']
 
 [CCIP.Env.Network.EVMNetworks.PRIVATE-CHAIN-1]
 evm_name = 'private-chain-1'
@@ -152,7 +159,7 @@ BatchGasLimit = 11000000
 TimeoutForPriceUpdate = '15m'
 NoOfTokensPerChain = 10
 NoOfTokensWithDynamicPrice = 10
-DynamicPriceUpdateInterval ='15s'
+DynamicPriceUpdateInterval = '15s'
 CCIPOwnerTokens = true
 
 [CCIP.Groups.load.LoadProfile]
@@ -164,7 +171,7 @@ NetworkChaosDelay = '100ms'
 
 # to represent 20%, 60%, 15%, 5% of the total messages
 [CCIP.Groups.load.LoadProfile.MsgProfile]
-Frequencies = [4,12,3,1]
+Frequencies = [4, 12, 3, 1]
 
 [[CCIP.Groups.load.LoadProfile.MsgProfile.MsgDetails]]
 MsgType = 'Token'
diff --git a/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/prod-testnet.toml b/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/prod-testnet.toml
index f8321584c8..917a739b18 100644
--- a/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/prod-testnet.toml
+++ b/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/prod-testnet.toml
@@ -901,26 +901,20 @@ Data = """
 """
 
 [CCIP.Env]
-TTL = '8h'
+TTL = '2h'
 
 [CCIP.Env.Network]
 selected_networks = [
-  'ARBITRUM_SEPOLIA',
-  'AVALANCHE_FUJI',
-  'OPTIMISM_SEPOLIA',
-  'BASE_SEPOLIA',
-  'BSC_TESTNET',
-  'WEMIX_TESTNET',
-  'SEPOLIA',
-  'POLYGON_AMOY',
-  'KROMA_SEPOLIA',
-  'BLAST_SEPOLIA'  
+    'AVALANCHE_FUJI',
+    'OPTIMISM_SEPOLIA',
+    'BASE_SEPOLIA',
+    'SEPOLIA',
 ]
 
 [CCIP.Groups.load]
 NetworkPairs = [
-  'AVALANCHE_FUJI,SEPOLIA',
-  'OPTIMISM_SEPOLIA,BASE_SEPOLIA'
+    'AVALANCHE_FUJI,SEPOLIA',
+    'OPTIMISM_SEPOLIA,BASE_SEPOLIA'
 ]
 
 BiDirectionalLane = true
@@ -929,15 +923,21 @@ ExistingDeployment = true
 
 NoOfTokensPerChain = 1
 
+# 1msg/5sec = 12msg/min
 [CCIP.Groups.load.LoadProfile]
-RequestPerUnitTime = [1]
-TimeUnit = '5s'
+RequestPerUnitTime = [12]
+TimeUnit = '1m'
 TestDuration = '1h'
 TestRunName = 'v2.12.0-ccip1.4.16-load'
 
+# There is slower exec rounds in Sepolia/Ethereum, therefore reducing the frequency
+# 1msg/12sec = 5msg/min
+[CCIP.Groups.load.LoadProfile.FrequencyByDestination.sepolia-testnet]
+RequestPerUnitTime = [5]
+
 # to represent 20%, 60%, 15%, 5% of the total messages
 [CCIP.Groups.load.LoadProfile.MsgProfile]
-Frequencies = [4,12,3,1]
+Frequencies = [4, 12, 3, 1]
 
 [[CCIP.Groups.load.LoadProfile.MsgProfile.MsgDetails]]
 MsgType = 'Token'
diff --git a/integration-tests/ccip-tests/testsetups/ccip.go b/integration-tests/ccip-tests/testsetups/ccip.go
index 3fb25bc675..6e3ee5b7e8 100644
--- a/integration-tests/ccip-tests/testsetups/ccip.go
+++ b/integration-tests/ccip-tests/testsetups/ccip.go
@@ -30,6 +30,7 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	ctfClient "github.com/smartcontractkit/chainlink-testing-framework/client"
 	ctfconfig "github.com/smartcontractkit/chainlink-testing-framework/config"
+	ctfconfigtypes "github.com/smartcontractkit/chainlink-testing-framework/config/types"
 	ctftestenv "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/config"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/environment"
@@ -276,8 +277,8 @@ func (c *CCIPTestConfig) SetNetworkPairs(lggr zerolog.Logger) error {
 				allError = multierr.Append(allError, fmt.Errorf("failed to get default chain config: %w", err))
 			} else {
 				chainConfig.ChainID = int(chainID)
-				eth1 := ctfconfig.EthereumVersion_Eth1
-				geth := ctfconfig.ExecutionLayer_Geth
+				eth1 := ctfconfigtypes.EthereumVersion_Eth1
+				geth := ctfconfigtypes.ExecutionLayer_Geth
 
 				c.EnvInput.PrivateEthereumNetworks[fmt.Sprint(chainID)] = &ctfconfig.EthereumNetworkConfig{
 					EthereumVersion:     &eth1,
diff --git a/integration-tests/ccip-tests/testsetups/test_env.go b/integration-tests/ccip-tests/testsetups/test_env.go
index e0a9c84482..1eb7ebd452 100644
--- a/integration-tests/ccip-tests/testsetups/test_env.go
+++ b/integration-tests/ccip-tests/testsetups/test_env.go
@@ -14,6 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	ctfconfig "github.com/smartcontractkit/chainlink-testing-framework/config"
+	ctfconfigtypes "github.com/smartcontractkit/chainlink-testing-framework/config/types"
 	"github.com/smartcontractkit/chainlink-testing-framework/networks"
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/conversions"
 
@@ -292,8 +293,8 @@ func DeployLocalCluster(
 				require.NoError(t, err, "failed to get default chain config: %w", err)
 			} else {
 				chainConfig.ChainID = int(network.ChainID)
-				eth1 := ctfconfig.EthereumVersion_Eth1
-				geth := ctfconfig.ExecutionLayer_Geth
+				eth1 := ctfconfigtypes.EthereumVersion_Eth1
+				geth := ctfconfigtypes.ExecutionLayer_Geth
 
 				privateEthereumNetworks = append(privateEthereumNetworks, &ctfconfig.EthereumNetworkConfig{
 					EthereumVersion:     &eth1,
@@ -489,8 +490,7 @@ func DeployEnvironments(
 							"fullnameOverride": actions.NetworkName(network.Name),
 							"image": map[string]interface{}{
 								"repository": "ghcr.io/foundry-rs/foundry",
-								"tag":        "nightly-5ac78a9cd4b94dc53d1fe5e0f42372b28b5a7559",
-								//	"tag":        "nightly-ea2eff95b5c17edd3ffbdfc6daab5ce5cc80afc0",
+								"tag":        "nightly-2442e7a5fc165d7d0b022aa8b9f09dcdf675157b",
 							},
 							"anvil": map[string]interface{}{
 								"chainId":                   fmt.Sprintf("%d", network.ChainID),
diff --git a/integration-tests/chaos/ocr_chaos_test.go b/integration-tests/chaos/ocr_chaos_test.go
index 54a02cf64f..052726afda 100644
--- a/integration-tests/chaos/ocr_chaos_test.go
+++ b/integration-tests/chaos/ocr_chaos_test.go
@@ -178,8 +178,7 @@ func TestOCRChaos(t *testing.T) {
 				require.NoError(t, err, "Error tearing down environment")
 			})
 
-			ms, err := ctfClient.ConnectMockServer(testEnvironment)
-			require.NoError(t, err, "Creating mockserver clients shouldn't fail")
+			ms := ctfClient.ConnectMockServer(testEnvironment)
 
 			linkContract, err := contracts.DeployLinkTokenContract(l, seth)
 			require.NoError(t, err, "Error deploying link token contract")
diff --git a/integration-tests/citool/cmd/create_test_config_cmd.go b/integration-tests/citool/cmd/create_test_config_cmd.go
index bc1b65bcdc..518a041318 100644
--- a/integration-tests/citool/cmd/create_test_config_cmd.go
+++ b/integration-tests/citool/cmd/create_test_config_cmd.go
@@ -7,14 +7,15 @@ import (
 	"github.com/pelletier/go-toml/v2"
 	"github.com/spf13/cobra"
 
-	ctf_config "github.com/smartcontractkit/chainlink-testing-framework/config"
+	ctfconfig "github.com/smartcontractkit/chainlink-testing-framework/config"
+	ctfconfigtypes "github.com/smartcontractkit/chainlink-testing-framework/config/types"
 )
 
 var createTestConfigCmd = &cobra.Command{
 	Use:   "create",
 	Short: "Create a test config from the provided flags",
 	Run: func(cmd *cobra.Command, _ []string) {
-		var tc ctf_config.TestConfig
+		var tc ctfconfig.TestConfig
 
 		var version, postgresVersion *string
 		if cmd.Flags().Changed(ChainlinkVersionFlag) {
@@ -24,7 +25,7 @@ var createTestConfigCmd = &cobra.Command{
 			version = &oc.ChainlinkPostgresVersion
 		}
 		if version != nil || postgresVersion != nil {
-			tc.ChainlinkImage = &ctf_config.ChainlinkImageConfig{
+			tc.ChainlinkImage = &ctfconfig.ChainlinkImageConfig{
 				Version:         version,
 				PostgresVersion: postgresVersion,
 			}
@@ -35,7 +36,7 @@ var createTestConfigCmd = &cobra.Command{
 			upgradeVersion = &oc.ChainlinkUpgradeVersion
 		}
 		if upgradeVersion != nil {
-			tc.ChainlinkUpgradeImage = &ctf_config.ChainlinkImageConfig{
+			tc.ChainlinkUpgradeImage = &ctfconfig.ChainlinkImageConfig{
 				Version: upgradeVersion,
 			}
 		}
@@ -45,7 +46,7 @@ var createTestConfigCmd = &cobra.Command{
 			selectedNetworks = &oc.SelectedNetworks
 		}
 		if selectedNetworks != nil {
-			tc.Network = &ctf_config.NetworkConfig{
+			tc.Network = &ctfconfig.NetworkConfig{
 				SelectedNetworks: oc.SelectedNetworks,
 			}
 		}
@@ -65,7 +66,7 @@ var createTestConfigCmd = &cobra.Command{
 			pyroscopeEnvironment = &oc.PyroscopeEnvironment
 		}
 		if peryscopeEnabled != nil {
-			tc.Pyroscope = &ctf_config.PyroscopeConfig{
+			tc.Pyroscope = &ctfconfig.PyroscopeConfig{
 				Enabled:     peryscopeEnabled,
 				ServerUrl:   pyroscopeServerURL,
 				Environment: pyroscopeEnvironment,
@@ -111,23 +112,23 @@ var createTestConfigCmd = &cobra.Command{
 		}
 
 		if testLogCollect != nil || loggingRunID != nil || loggingLogTargets != nil || loggingLokiEndpoint != nil || loggingLokiTenantID != nil || loggingLokiBasicAuth != nil || loggingGrafanaBaseURL != nil || loggingGrafanaDashboardURL != nil || loggingGrafanaBearerToken != nil {
-			tc.Logging = &ctf_config.LoggingConfig{}
+			tc.Logging = &ctfconfig.LoggingConfig{}
 			tc.Logging.TestLogCollect = testLogCollect
 			tc.Logging.RunId = loggingRunID
 			if loggingLogTargets != nil {
-				tc.Logging.LogStream = &ctf_config.LogStreamConfig{
+				tc.Logging.LogStream = &ctfconfig.LogStreamConfig{
 					LogTargets: loggingLogTargets,
 				}
 			}
 			if loggingLokiTenantID != nil || loggingLokiBasicAuth != nil || loggingLokiEndpoint != nil {
-				tc.Logging.Loki = &ctf_config.LokiConfig{
+				tc.Logging.Loki = &ctfconfig.LokiConfig{
 					TenantId:  loggingLokiTenantID,
 					BasicAuth: loggingLokiBasicAuth,
 					Endpoint:  loggingLokiEndpoint,
 				}
 			}
 			if loggingGrafanaBaseURL != nil || loggingGrafanaDashboardURL != nil || loggingGrafanaBearerToken != nil {
-				tc.Logging.Grafana = &ctf_config.GrafanaConfig{
+				tc.Logging.Grafana = &ctfconfig.GrafanaConfig{
 					BaseUrl:      loggingGrafanaBaseURL,
 					DashboardUrl: loggingGrafanaDashboardURL,
 					BearerToken:  loggingGrafanaBearerToken,
@@ -148,19 +149,19 @@ var createTestConfigCmd = &cobra.Command{
 			privateEthereumNetworkCustomDockerImage = &oc.PrivateEthereumNetworkCustomDockerImages
 		}
 		if privateEthereumNetworkExecutionLayer != nil || privateEthereumNetworkEthereumVersion != nil || privateEthereumNetworkCustomDockerImage != nil {
-			var el ctf_config.ExecutionLayer
+			var el ctfconfigtypes.ExecutionLayer
 			if privateEthereumNetworkExecutionLayer != nil {
-				el = ctf_config.ExecutionLayer(*privateEthereumNetworkExecutionLayer)
+				el = ctfconfigtypes.ExecutionLayer(*privateEthereumNetworkExecutionLayer)
 			}
-			var ev ctf_config.EthereumVersion
+			var ev ctfconfigtypes.EthereumVersion
 			if privateEthereumNetworkEthereumVersion != nil {
-				ev = ctf_config.EthereumVersion(*privateEthereumNetworkEthereumVersion)
+				ev = ctfconfigtypes.EthereumVersion(*privateEthereumNetworkEthereumVersion)
 			}
-			var customImages map[ctf_config.ContainerType]string
+			var customImages map[ctfconfig.ContainerType]string
 			if privateEthereumNetworkCustomDockerImage != nil {
-				customImages = map[ctf_config.ContainerType]string{"execution_layer": *privateEthereumNetworkCustomDockerImage}
+				customImages = map[ctfconfig.ContainerType]string{"execution_layer": *privateEthereumNetworkCustomDockerImage}
 			}
-			tc.PrivateEthereumNetwork = &ctf_config.EthereumNetworkConfig{
+			tc.PrivateEthereumNetwork = &ctfconfig.EthereumNetworkConfig{
 				ExecutionLayer:     &el,
 				EthereumVersion:    &ev,
 				CustomDockerImages: customImages,
diff --git a/integration-tests/citool/cmd/test_config_cmd_test.go b/integration-tests/citool/cmd/test_config_cmd_test.go
index fb1ef5332b..3fcc25fd17 100644
--- a/integration-tests/citool/cmd/test_config_cmd_test.go
+++ b/integration-tests/citool/cmd/test_config_cmd_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	ctf_config "github.com/smartcontractkit/chainlink-testing-framework/config"
+	ctfconfigtypes "github.com/smartcontractkit/chainlink-testing-framework/config/types"
 )
 
 func TestCreateTestConfigCmd(t *testing.T) {
@@ -34,8 +35,8 @@ func TestCreateTestConfigCmd(t *testing.T) {
 			check: func(t *testing.T, tc *ctf_config.TestConfig) {
 				assert.NotNil(t, tc.PrivateEthereumNetwork)
 				assert.NotNil(t, tc.PrivateEthereumNetwork.ExecutionLayer)
-				assert.Equal(t, ctf_config.ExecutionLayer("geth"), *tc.PrivateEthereumNetwork.ExecutionLayer)
-				assert.Equal(t, ctf_config.EthereumVersion("1.10.0"), *tc.PrivateEthereumNetwork.EthereumVersion)
+				assert.Equal(t, ctfconfigtypes.ExecutionLayer("geth"), *tc.PrivateEthereumNetwork.ExecutionLayer)
+				assert.Equal(t, ctfconfigtypes.EthereumVersion("1.10.0"), *tc.PrivateEthereumNetwork.EthereumVersion)
 			},
 		},
 		{
diff --git a/integration-tests/deployment/address_book.go b/integration-tests/deployment/address_book.go
deleted file mode 100644
index 4a5916111c..0000000000
--- a/integration-tests/deployment/address_book.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package deployment
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/Masterminds/semver/v3"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/pkg/errors"
-	chainsel "github.com/smartcontractkit/chain-selectors"
-)
-
-var (
-	ErrInvalidChainSelector = fmt.Errorf("invalid chain selector")
-	ErrInvalidAddress       = fmt.Errorf("invalid address")
-)
-
-// ContractType is a simple string type for identifying contract types.
-type ContractType string
-
-var (
-	Version1_0_0     = *semver.MustParse("1.0.0")
-	Version1_1_0     = *semver.MustParse("1.1.0")
-	Version1_2_0     = *semver.MustParse("1.2.0")
-	Version1_5_0     = *semver.MustParse("1.5.0")
-	Version1_6_0_dev = *semver.MustParse("1.6.0-dev")
-)
-
-type TypeAndVersion struct {
-	Type    ContractType
-	Version semver.Version
-}
-
-func (tv TypeAndVersion) String() string {
-	return fmt.Sprintf("%s %s", tv.Type, tv.Version.String())
-}
-
-func (tv TypeAndVersion) Equal(other TypeAndVersion) bool {
-	return tv.String() == other.String()
-}
-
-func MustTypeAndVersionFromString(s string) TypeAndVersion {
-	tv, err := TypeAndVersionFromString(s)
-	if err != nil {
-		panic(err)
-	}
-	return tv
-}
-
-// Note this will become useful for validation. When we want
-// to assert an onchain call to typeAndVersion yields whats expected.
-func TypeAndVersionFromString(s string) (TypeAndVersion, error) {
-	parts := strings.Split(s, " ")
-	if len(parts) != 2 {
-		return TypeAndVersion{}, fmt.Errorf("invalid type and version string: %s", s)
-	}
-	v, err := semver.NewVersion(parts[1])
-	if err != nil {
-		return TypeAndVersion{}, err
-	}
-	return TypeAndVersion{
-		Type:    ContractType(parts[0]),
-		Version: *v,
-	}, nil
-}
-
-func NewTypeAndVersion(t ContractType, v semver.Version) TypeAndVersion {
-	return TypeAndVersion{
-		Type:    t,
-		Version: v,
-	}
-}
-
-// AddressBook is a simple interface for storing and retrieving contract addresses across
-// chains. It is family agnostic as the keys are chain selectors.
-// We store rather than derive typeAndVersion as some contracts do not support it.
-// For ethereum addresses are always stored in EIP55 format.
-type AddressBook interface {
-	Save(chainSelector uint64, address string, tv TypeAndVersion) error
-	Addresses() (map[uint64]map[string]TypeAndVersion, error)
-	AddressesForChain(chain uint64) (map[string]TypeAndVersion, error)
-	// Allows for merging address books (e.g. new deployments with existing ones)
-	Merge(other AddressBook) error
-}
-
-type AddressBookMap struct {
-	AddressesByChain map[uint64]map[string]TypeAndVersion
-}
-
-func (m *AddressBookMap) Save(chainSelector uint64, address string, typeAndVersion TypeAndVersion) error {
-	_, exists := chainsel.ChainBySelector(chainSelector)
-	if !exists {
-		return errors.Wrapf(ErrInvalidChainSelector, "chain selector %d not found", chainSelector)
-	}
-	if address == "" || address == common.HexToAddress("0x0").Hex() {
-		return errors.Wrap(ErrInvalidAddress, "address cannot be empty")
-	}
-	if common.IsHexAddress(address) {
-		// IMPORTANT: WE ALWAYS STANDARDIZE ETHEREUM ADDRESS STRINGS TO EIP55
-		address = common.HexToAddress(address).Hex()
-	} else {
-		return errors.Wrapf(ErrInvalidAddress, "address %s is not a valid Ethereum address, only Ethereum addresses supported", address)
-	}
-	if typeAndVersion.Type == "" {
-		return fmt.Errorf("type cannot be empty")
-	}
-	if _, exists := m.AddressesByChain[chainSelector]; !exists {
-		// First time chain add, create map
-		m.AddressesByChain[chainSelector] = make(map[string]TypeAndVersion)
-	}
-	if _, exists := m.AddressesByChain[chainSelector][address]; exists {
-		return fmt.Errorf("address %s already exists for chain %d", address, chainSelector)
-	}
-	m.AddressesByChain[chainSelector][address] = typeAndVersion
-	return nil
-}
-
-func (m *AddressBookMap) Addresses() (map[uint64]map[string]TypeAndVersion, error) {
-	return m.AddressesByChain, nil
-}
-
-func (m *AddressBookMap) AddressesForChain(chain uint64) (map[string]TypeAndVersion, error) {
-	if _, exists := m.AddressesByChain[chain]; !exists {
-		return nil, fmt.Errorf("chain %d not found", chain)
-	}
-	return m.AddressesByChain[chain], nil
-}
-
-// Attention this will mutate existing book
-func (m *AddressBookMap) Merge(ab AddressBook) error {
-	addresses, err := ab.Addresses()
-	if err != nil {
-		return err
-	}
-	for chain, chainAddresses := range addresses {
-		for address, typeAndVersions := range chainAddresses {
-			if err := m.Save(chain, address, typeAndVersions); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// TODO: Maybe could add an environment argument
-// which would ensure only mainnet/testnet chain selectors are used
-// for further safety?
-func NewMemoryAddressBook() *AddressBookMap {
-	return &AddressBookMap{
-		AddressesByChain: make(map[uint64]map[string]TypeAndVersion),
-	}
-}
-
-func NewMemoryAddressBookFromMap(addressesByChain map[uint64]map[string]TypeAndVersion) *AddressBookMap {
-	return &AddressBookMap{
-		AddressesByChain: addressesByChain,
-	}
-}
diff --git a/integration-tests/deployment/address_book_test.go b/integration-tests/deployment/address_book_test.go
deleted file mode 100644
index c6967df0ca..0000000000
--- a/integration-tests/deployment/address_book_test.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package deployment
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/common"
-	chainsel "github.com/smartcontractkit/chain-selectors"
-	"github.com/stretchr/testify/require"
-	"gotest.tools/v3/assert"
-)
-
-func TestAddressBook_Save(t *testing.T) {
-	ab := NewMemoryAddressBook()
-	onRamp100 := NewTypeAndVersion("OnRamp", Version1_0_0)
-	onRamp110 := NewTypeAndVersion("OnRamp", Version1_1_0)
-	addr1 := common.HexToAddress("0x1").String()
-	addr2 := common.HexToAddress("0x2").String()
-
-	err := ab.Save(chainsel.TEST_90000001.Selector, addr1, onRamp100)
-	require.NoError(t, err)
-
-	// Check input validation
-	err = ab.Save(chainsel.TEST_90000001.Selector, "asdlfkj", onRamp100)
-	require.Error(t, err)
-	assert.Equal(t, errors.Is(err, ErrInvalidAddress), true, "err %s", err)
-	err = ab.Save(0, addr1, onRamp100)
-	require.Error(t, err)
-	assert.Equal(t, errors.Is(err, ErrInvalidChainSelector), true)
-	// Duplicate
-	err = ab.Save(chainsel.TEST_90000001.Selector, addr1, onRamp100)
-	require.Error(t, err)
-	// Zero address
-	err = ab.Save(chainsel.TEST_90000001.Selector, common.HexToAddress("0x0").Hex(), onRamp100)
-	require.Error(t, err)
-
-	// Distinct address same TV will not
-	err = ab.Save(chainsel.TEST_90000001.Selector, addr2, onRamp100)
-	require.NoError(t, err)
-	// Same address different chain will not error
-	err = ab.Save(chainsel.TEST_90000002.Selector, addr1, onRamp100)
-	require.NoError(t, err)
-	// We can save different versions of the same contract
-	err = ab.Save(chainsel.TEST_90000002.Selector, addr2, onRamp110)
-	require.NoError(t, err)
-
-	addresses, err := ab.Addresses()
-	require.NoError(t, err)
-	assert.DeepEqual(t, addresses, map[uint64]map[string]TypeAndVersion{
-		chainsel.TEST_90000001.Selector: {
-			addr1: onRamp100,
-			addr2: onRamp100,
-		},
-		chainsel.TEST_90000002.Selector: {
-			addr1: onRamp100,
-			addr2: onRamp110,
-		},
-	})
-}
-
-func TestAddressBook_Merge(t *testing.T) {
-	onRamp100 := NewTypeAndVersion("OnRamp", Version1_0_0)
-	onRamp110 := NewTypeAndVersion("OnRamp", Version1_1_0)
-	addr1 := common.HexToAddress("0x1").String()
-	addr2 := common.HexToAddress("0x2").String()
-	a1 := NewMemoryAddressBookFromMap(map[uint64]map[string]TypeAndVersion{
-		chainsel.TEST_90000001.Selector: {
-			addr1: onRamp100,
-		},
-	})
-	a2 := NewMemoryAddressBookFromMap(map[uint64]map[string]TypeAndVersion{
-		chainsel.TEST_90000001.Selector: {
-			addr2: onRamp100,
-		},
-		chainsel.TEST_90000002.Selector: {
-			addr1: onRamp110,
-		},
-	})
-	require.NoError(t, a1.Merge(a2))
-
-	addresses, err := a1.Addresses()
-	require.NoError(t, err)
-	assert.DeepEqual(t, addresses, map[uint64]map[string]TypeAndVersion{
-		chainsel.TEST_90000001.Selector: {
-			addr1: onRamp100,
-			addr2: onRamp100,
-		},
-		chainsel.TEST_90000002.Selector: {
-			addr1: onRamp110,
-		},
-	})
-
-	// Merge with conflicting addresses should error
-	a3 := NewMemoryAddressBookFromMap(map[uint64]map[string]TypeAndVersion{
-		chainsel.TEST_90000001.Selector: {
-			addr1: onRamp100,
-		},
-	})
-	require.Error(t, a1.Merge(a3))
-	// a1 should not have changed
-	addresses, err = a1.Addresses()
-	require.NoError(t, err)
-	assert.DeepEqual(t, addresses, map[uint64]map[string]TypeAndVersion{
-		chainsel.TEST_90000001.Selector: {
-			addr1: onRamp100,
-			addr2: onRamp100,
-		},
-		chainsel.TEST_90000002.Selector: {
-			addr1: onRamp110,
-		},
-	})
-}
diff --git a/integration-tests/deployment/ccip/add_lane.go b/integration-tests/deployment/ccip/add_lane.go
deleted file mode 100644
index c9d949cbe9..0000000000
--- a/integration-tests/deployment/ccip/add_lane.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package ccipdeployment
-
-import (
-	"encoding/hex"
-	"math/big"
-
-	"github.com/ethereum/go-ethereum/common"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
-
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
-)
-
-func AddLane(e deployment.Environment, state CCIPOnChainState, from, to uint64) error {
-	// TODO: Batch
-	tx, err := state.Chains[from].Router.ApplyRampUpdates(e.Chains[from].DeployerKey, []router.RouterOnRamp{
-		{
-			DestChainSelector: to,
-			OnRamp:            state.Chains[from].EvmOnRampV160.Address(),
-		},
-	}, []router.RouterOffRamp{}, []router.RouterOffRamp{})
-	if err := deployment.ConfirmIfNoError(e.Chains[from], tx, err); err != nil {
-		return err
-	}
-	tx, err = state.Chains[from].EvmOnRampV160.ApplyDestChainConfigUpdates(e.Chains[from].DeployerKey,
-		[]onramp.OnRampDestChainConfigArgs{
-			{
-				DestChainSelector: to,
-				Router:            state.Chains[from].Router.Address(),
-			},
-		})
-	if err := deployment.ConfirmIfNoError(e.Chains[from], tx, err); err != nil {
-		return err
-	}
-
-	_, err = state.Chains[from].PriceRegistry.UpdatePrices(
-		e.Chains[from].DeployerKey, price_registry.InternalPriceUpdates{
-			TokenPriceUpdates: []price_registry.InternalTokenPriceUpdate{
-				{
-					SourceToken: state.Chains[from].LinkToken.Address(),
-					UsdPerToken: deployment.E18Mult(20),
-				},
-				{
-					SourceToken: state.Chains[from].Weth9.Address(),
-					UsdPerToken: deployment.E18Mult(4000),
-				},
-			},
-			GasPriceUpdates: []price_registry.InternalGasPriceUpdate{
-				{
-					DestChainSelector: to,
-					UsdPerUnitGas:     big.NewInt(2e12),
-				},
-			}})
-	if err := deployment.ConfirmIfNoError(e.Chains[from], tx, err); err != nil {
-		return err
-	}
-
-	// Enable dest in price registry
-	tx, err = state.Chains[from].PriceRegistry.ApplyDestChainConfigUpdates(e.Chains[from].DeployerKey,
-		[]price_registry.PriceRegistryDestChainConfigArgs{
-			{
-				DestChainSelector: to,
-				DestChainConfig:   defaultPriceRegistryDestChainConfig(),
-			},
-		})
-	if err := deployment.ConfirmIfNoError(e.Chains[from], tx, err); err != nil {
-		return err
-	}
-
-	tx, err = state.Chains[to].EvmOffRampV160.ApplySourceChainConfigUpdates(e.Chains[to].DeployerKey,
-		[]offramp.OffRampSourceChainConfigArgs{
-			{
-				Router:              state.Chains[to].Router.Address(),
-				SourceChainSelector: from,
-				IsEnabled:           true,
-				OnRamp:              common.LeftPadBytes(state.Chains[from].EvmOnRampV160.Address().Bytes(), 32),
-			},
-		})
-	if err := deployment.ConfirmIfNoError(e.Chains[to], tx, err); err != nil {
-		return err
-	}
-	tx, err = state.Chains[to].Router.ApplyRampUpdates(e.Chains[to].DeployerKey, []router.RouterOnRamp{}, []router.RouterOffRamp{}, []router.RouterOffRamp{
-		{
-			SourceChainSelector: from,
-			OffRamp:             state.Chains[to].EvmOffRampV160.Address(),
-		},
-	})
-	return deployment.ConfirmIfNoError(e.Chains[to], tx, err)
-}
-
-func defaultPriceRegistryDestChainConfig() price_registry.PriceRegistryDestChainConfig {
-	// https://github.com/smartcontractkit/ccip/blob/c4856b64bd766f1ddbaf5d13b42d3c4b12efde3a/contracts/src/v0.8/ccip/libraries/Internal.sol#L337-L337
-	/*
-		```Solidity
-			// bytes4(keccak256("CCIP ChainFamilySelector EVM"))
-			bytes4 public constant CHAIN_FAMILY_SELECTOR_EVM = 0x2812d52c;
-		```
-	*/
-	evmFamilySelector, _ := hex.DecodeString("2812d52c")
-	return price_registry.PriceRegistryDestChainConfig{
-		IsEnabled:                         true,
-		MaxNumberOfTokensPerMsg:           10,
-		MaxDataBytes:                      256,
-		MaxPerMsgGasLimit:                 3_000_000,
-		DestGasOverhead:                   50_000,
-		DefaultTokenFeeUSDCents:           1,
-		DestGasPerPayloadByte:             10,
-		DestDataAvailabilityOverheadGas:   0,
-		DestGasPerDataAvailabilityByte:    100,
-		DestDataAvailabilityMultiplierBps: 1,
-		DefaultTokenDestGasOverhead:       125_000,
-		DefaultTokenDestBytesOverhead:     32,
-		DefaultTxGasLimit:                 200_000,
-		GasMultiplierWeiPerEth:            1,
-		NetworkFeeUSDCents:                1,
-		ChainFamilySelector:               [4]byte(evmFamilySelector),
-	}
-}
diff --git a/integration-tests/deployment/ccip/add_lane_test.go b/integration-tests/deployment/ccip/add_lane_test.go
deleted file mode 100644
index 567f5ca685..0000000000
--- a/integration-tests/deployment/ccip/add_lane_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package ccipdeployment
diff --git a/integration-tests/deployment/ccip/changeset/1_cap_reg.go b/integration-tests/deployment/ccip/changeset/1_cap_reg.go
deleted file mode 100644
index 1929aede02..0000000000
--- a/integration-tests/deployment/ccip/changeset/1_cap_reg.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package changeset
-
-import (
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	ccipdeployment "github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip"
-)
-
-// Separate migration because cap reg is an env var for CL nodes.
-func Apply0001(env deployment.Environment, homeChainSel uint64) (deployment.ChangesetOutput, error) {
-	// Note we also deploy the cap reg.
-	ab, _, err := ccipdeployment.DeployCapReg(env.Logger, env.Chains, homeChainSel)
-	if err != nil {
-		env.Logger.Errorw("Failed to deploy cap reg", "err", err, "addresses", ab)
-		return deployment.ChangesetOutput{}, err
-	}
-	return deployment.ChangesetOutput{
-		Proposals:   []deployment.Proposal{},
-		AddressBook: ab,
-		JobSpecs:    nil,
-	}, nil
-}
diff --git a/integration-tests/deployment/ccip/changeset/2_initial_deploy.go b/integration-tests/deployment/ccip/changeset/2_initial_deploy.go
deleted file mode 100644
index b20ffb2d4a..0000000000
--- a/integration-tests/deployment/ccip/changeset/2_initial_deploy.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package changeset
-
-import (
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-
-	ccipdeployment "github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip"
-)
-
-// We expect the change set input to be unique per change set.
-// TODO: Maybe there's a generics approach here?
-// Note if the change set is a deployment and it fails we have 2 options:
-// - Just throw away the addresses, fix issue and try again (potentially expensive on mainnet)
-func Apply0002(env deployment.Environment, c ccipdeployment.DeployCCIPContractConfig) (deployment.ChangesetOutput, error) {
-	ab, err := ccipdeployment.DeployCCIPContracts(env, c)
-	if err != nil {
-		env.Logger.Errorw("Failed to deploy CCIP contracts", "err", err, "addresses", ab)
-		return deployment.ChangesetOutput{}, err
-	}
-	js, err := ccipdeployment.NewCCIPJobSpecs(env.NodeIDs, env.Offchain)
-	if err != nil {
-		return deployment.ChangesetOutput{}, err
-	}
-	proposal, err := ccipdeployment.GenerateAcceptOwnershipProposal(env, env.AllChainSelectors(), ab)
-	if err != nil {
-		return deployment.ChangesetOutput{}, err
-	}
-	return deployment.ChangesetOutput{
-		Proposals:   []deployment.Proposal{proposal},
-		AddressBook: ab,
-		// Mapping of which nodes get which jobs.
-		JobSpecs: js,
-	}, nil
-}
diff --git a/integration-tests/deployment/ccip/changeset/2_initial_deploy_test.go b/integration-tests/deployment/ccip/changeset/2_initial_deploy_test.go
deleted file mode 100644
index db9fd994fd..0000000000
--- a/integration-tests/deployment/ccip/changeset/2_initial_deploy_test.go
+++ /dev/null
@@ -1,241 +0,0 @@
-package changeset
-
-import (
-	"context"
-	"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/common"
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-
-	jobv1 "github.com/smartcontractkit/chainlink/integration-tests/deployment/jd/job/v1"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
-
-	ccipdeployment "github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/memory"
-
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-)
-
-func Test0002_InitialDeploy(t *testing.T) {
-	lggr := logger.TestLogger(t)
-	ctx := ccipdeployment.Context(t)
-	tenv := ccipdeployment.NewDeployedTestEnvironment(t, lggr)
-	e := tenv.Env
-	nodes := tenv.Nodes
-	chains := e.Chains
-
-	state, err := ccipdeployment.LoadOnchainState(tenv.Env, tenv.Ab)
-	require.NoError(t, err)
-
-	// Apply migration
-	output, err := Apply0002(tenv.Env, ccipdeployment.DeployCCIPContractConfig{
-		HomeChainSel: tenv.HomeChainSel,
-		// Capreg/config already exist.
-		CCIPOnChainState: state,
-	})
-	require.NoError(t, err)
-	// Get new state after migration.
-	state, err = ccipdeployment.LoadOnchainState(e, output.AddressBook)
-	require.NoError(t, err)
-
-	// Ensure capreg logs are up to date.
-	require.NoError(t, ReplayAllLogs(nodes, chains))
-
-	// Apply the jobs.
-	for nodeID, jobs := range output.JobSpecs {
-		for _, job := range jobs {
-			// Note these auto-accept
-			_, err := e.Offchain.ProposeJob(ctx,
-				&jobv1.ProposeJobRequest{
-					NodeId: nodeID,
-					Spec:   job,
-				})
-			require.NoError(t, err)
-		}
-	}
-	// Wait for plugins to register filters?
-	// TODO: Investigate how to avoid.
-	time.Sleep(30 * time.Second)
-
-	// Ensure job related logs are up to date.
-	require.NoError(t, ReplayAllLogs(nodes, chains))
-
-	// Send a request from every router
-	// Add all lanes
-	for source := range e.Chains {
-		for dest := range e.Chains {
-			if source != dest {
-				require.NoError(t, ccipdeployment.AddLane(e, state, source, dest))
-			}
-		}
-	}
-
-	// Send a message from each chain to every other chain.
-	for src, srcChain := range e.Chains {
-		for dest := range e.Chains {
-			if src == dest {
-				continue
-			}
-			msg := router.ClientEVM2AnyMessage{
-				Receiver:     common.LeftPadBytes(state.Chains[dest].Receiver.Address().Bytes(), 32),
-				Data:         []byte("hello"),
-				TokenAmounts: nil, // TODO: no tokens for now
-				FeeToken:     state.Chains[src].Weth9.Address(),
-				ExtraArgs:    nil, // TODO: no extra args for now, falls back to default
-			}
-			fee, err := state.Chains[src].Router.GetFee(
-				&bind.CallOpts{Context: context.Background()}, dest, msg)
-			require.NoError(t, err, deployment.MaybeDataErr(err))
-			tx, err := state.Chains[src].Weth9.Deposit(&bind.TransactOpts{
-				From:   e.Chains[src].DeployerKey.From,
-				Signer: e.Chains[src].DeployerKey.Signer,
-				Value:  fee,
-			})
-			require.NoError(t, err)
-			require.NoError(t, srcChain.Confirm(tx.Hash()))
-
-			// TODO: should be able to avoid this by using native?
-			tx, err = state.Chains[src].Weth9.Approve(e.Chains[src].DeployerKey,
-				state.Chains[src].Router.Address(), fee)
-			require.NoError(t, err)
-			require.NoError(t, srcChain.Confirm(tx.Hash()))
-
-			t.Logf("Sending CCIP request from chain selector %d to chain selector %d",
-				src, dest)
-			tx, err = state.Chains[src].Router.CcipSend(e.Chains[src].DeployerKey, dest, msg)
-			require.NoError(t, err)
-			require.NoError(t, srcChain.Confirm(tx.Hash()))
-		}
-	}
-
-	// Wait for all commit reports to land.
-	var wg sync.WaitGroup
-	for src, srcChain := range e.Chains {
-		for dest, dstChain := range e.Chains {
-			if src == dest {
-				continue
-			}
-			srcChain := srcChain
-			dstChain := dstChain
-			wg.Add(1)
-			go func(src, dest uint64) {
-				defer wg.Done()
-				waitForCommitWithInterval(t, srcChain, dstChain, state.Chains[dest].EvmOffRampV160, ccipocr3.SeqNumRange{1, 1})
-			}(src, dest)
-		}
-	}
-	wg.Wait()
-
-	// Wait for all exec reports to land
-	for src, srcChain := range e.Chains {
-		for dest, dstChain := range e.Chains {
-			if src == dest {
-				continue
-			}
-			srcChain := srcChain
-			dstChain := dstChain
-			wg.Add(1)
-			go func(src, dest deployment.Chain) {
-				defer wg.Done()
-				waitForExecWithSeqNr(t, src, dest, state.Chains[dest.Selector].EvmOffRampV160, 1)
-			}(srcChain, dstChain)
-		}
-	}
-	wg.Wait()
-
-	// TODO: Apply the proposal.
-}
-
-func ReplayAllLogs(nodes map[string]memory.Node, chains map[uint64]deployment.Chain) error {
-	for _, node := range nodes {
-		for sel := range chains {
-			if err := node.ReplayLogs(map[uint64]uint64{sel: 1}); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func waitForCommitWithInterval(
-	t *testing.T,
-	src deployment.Chain,
-	dest deployment.Chain,
-	offRamp *offramp.OffRamp,
-	expectedSeqNumRange ccipocr3.SeqNumRange,
-) {
-	sink := make(chan *offramp.OffRampCommitReportAccepted)
-	subscription, err := offRamp.WatchCommitReportAccepted(&bind.WatchOpts{
-		Context: context.Background(),
-	}, sink)
-	require.NoError(t, err)
-	ticker := time.NewTicker(1 * time.Second)
-	defer ticker.Stop()
-
-	//revive:disable
-	for {
-		select {
-		case <-ticker.C:
-			src.Client.(*backends.SimulatedBackend).Commit()
-			dest.Client.(*backends.SimulatedBackend).Commit()
-			t.Logf("Waiting for commit report on chain selector %d from source selector %d expected seq nr range %s",
-				dest.Selector, src.Selector, expectedSeqNumRange.String())
-		case subErr := <-subscription.Err():
-			t.Fatalf("Subscription error: %+v", subErr)
-		case report := <-sink:
-			if len(report.Report.MerkleRoots) > 0 {
-				// Check the interval of sequence numbers and make sure it matches
-				// the expected range.
-				for _, mr := range report.Report.MerkleRoots {
-					if mr.SourceChainSelector == src.Selector &&
-						uint64(expectedSeqNumRange.Start()) == mr.Interval.Min &&
-						uint64(expectedSeqNumRange.End()) == mr.Interval.Max {
-						t.Logf("Received commit report on selector %d from source selector %d expected seq nr range %s",
-							dest.Selector, src.Selector, expectedSeqNumRange.String())
-						return
-					}
-				}
-			}
-		}
-	}
-}
-
-func waitForExecWithSeqNr(t *testing.T,
-	source, dest deployment.Chain,
-	offramp *offramp.OffRamp,
-	expectedSeqNr uint64) {
-	tick := time.NewTicker(5 * time.Second)
-	defer tick.Stop()
-	for range tick.C {
-		// TODO: Clean this up
-		source.Client.(*backends.SimulatedBackend).Commit()
-		dest.Client.(*backends.SimulatedBackend).Commit()
-		scc, err := offramp.GetSourceChainConfig(nil, source.Selector)
-		require.NoError(t, err)
-		t.Logf("Waiting for ExecutionStateChanged on chain  %d from chain %d with expected sequence number %d, current onchain minSeqNr: %d",
-			dest.Selector, source.Selector, expectedSeqNr, scc.MinSeqNr)
-		iter, err := offramp.FilterExecutionStateChanged(nil,
-			[]uint64{source.Selector}, []uint64{expectedSeqNr}, nil)
-		require.NoError(t, err)
-		var count int
-		for iter.Next() {
-			if iter.Event.SequenceNumber == expectedSeqNr && iter.Event.SourceChainSelector == source.Selector {
-				count++
-			}
-		}
-		if count == 1 {
-			t.Logf("Received ExecutionStateChanged on chain %d from chain %d with expected sequence number %d",
-				dest.Selector, source.Selector, expectedSeqNr)
-			return
-		}
-	}
-}
diff --git a/integration-tests/deployment/ccip/deploy.go b/integration-tests/deployment/ccip/deploy.go
deleted file mode 100644
index 0b6aa5a646..0000000000
--- a/integration-tests/deployment/ccip/deploy.go
+++ /dev/null
@@ -1,471 +0,0 @@
-package ccipdeployment
-
-import (
-	"fmt"
-	"math/big"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	owner_helpers "github.com/smartcontractkit/ccip-owner-contracts/gethwrappers"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/maybe_revert_message_receiver"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/mock_rmn_contract"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/nonce_manager"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_proxy_contract"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/token_admin_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/weth9"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/shared/generated/burn_mint_erc677"
-)
-
-var (
-	MockARM              deployment.ContractType = "MockRMN"
-	LinkToken            deployment.ContractType = "LinkToken"
-	ARMProxy             deployment.ContractType = "ARMProxy"
-	WETH9                deployment.ContractType = "WETH9"
-	Router               deployment.ContractType = "Router"
-	TokenAdminRegistry   deployment.ContractType = "TokenAdminRegistry"
-	NonceManager         deployment.ContractType = "NonceManager"
-	PriceRegistry        deployment.ContractType = "PriceRegistry"
-	ManyChainMultisig    deployment.ContractType = "ManyChainMultiSig"
-	CCIPConfig           deployment.ContractType = "CCIPConfig"
-	RBACTimelock         deployment.ContractType = "RBACTimelock"
-	OnRamp               deployment.ContractType = "OnRamp"
-	OffRamp              deployment.ContractType = "OffRamp"
-	CCIPReceiver         deployment.ContractType = "CCIPReceiver"
-	CapabilitiesRegistry deployment.ContractType = "CapabilitiesRegistry"
-)
-
-type Contracts interface {
-	*capabilities_registry.CapabilitiesRegistry |
-		*rmn_proxy_contract.RMNProxyContract |
-		*ccip_config.CCIPConfig |
-		*nonce_manager.NonceManager |
-		*price_registry.PriceRegistry |
-		*router.Router |
-		*token_admin_registry.TokenAdminRegistry |
-		*weth9.WETH9 |
-		*mock_rmn_contract.MockRMNContract |
-		*owner_helpers.ManyChainMultiSig |
-		*owner_helpers.RBACTimelock |
-		*offramp.OffRamp |
-		*onramp.OnRamp |
-		*burn_mint_erc677.BurnMintERC677 |
-		*maybe_revert_message_receiver.MaybeRevertMessageReceiver
-}
-
-type ContractDeploy[C Contracts] struct {
-	// We just keep all the deploy return values
-	// since some will be empty if there's an error.
-	Address  common.Address
-	Contract C
-	Tx       *types.Transaction
-	Tv       deployment.TypeAndVersion
-	Err      error
-}
-
-// TODO: pull up to general deployment pkg somehow
-// without exposing all product specific contracts?
-func deployContract[C Contracts](
-	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.Hash())
-	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
-}
-
-type DeployCCIPContractConfig struct {
-	HomeChainSel uint64
-	// Existing contracts which we want to skip deployment
-	// Leave empty if we want to deploy everything
-	// TODO: Add skips to deploy function.
-	CCIPOnChainState
-}
-
-// TODO: Likely we'll want to further parameterize the deployment
-// For example a list of contracts to skip deploying if they already exist.
-// Or mock vs real RMN.
-// Deployment produces an address book of everything it deployed.
-func DeployCCIPContracts(e deployment.Environment, c DeployCCIPContractConfig) (deployment.AddressBook, error) {
-	var ab deployment.AddressBook = deployment.NewMemoryAddressBook()
-	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 ab, err
-	}
-	if c.Chains[c.HomeChainSel].CapabilityRegistry == nil {
-		return ab, fmt.Errorf("Capability registry not found for home chain %d, needs to be deployed first", c.HomeChainSel)
-	}
-	cr, err := c.Chains[c.HomeChainSel].CapabilityRegistry.GetHashedCapabilityId(
-		&bind.CallOpts{}, CapabilityLabelledName, CapabilityVersion)
-	if err != nil {
-		e.Logger.Errorw("Failed to get hashed capability id", "err", err)
-		return ab, err
-	}
-	// Signal to CR that our nodes support CCIP capability.
-	if err := AddNodes(
-		c.Chains[c.HomeChainSel].CapabilityRegistry,
-		e.Chains[c.HomeChainSel],
-		nodes.PeerIDs(c.HomeChainSel), // Doesn't actually matter which sel here
-		[][32]byte{cr},
-	); err != nil {
-		return ab, err
-	}
-
-	for _, chain := range e.Chains {
-		ab, err = DeployChainContracts(e, chain, ab)
-		if err != nil {
-			return ab, err
-		}
-		chainAddresses, err := ab.AddressesForChain(chain.Selector)
-		if err != nil {
-			e.Logger.Errorw("Failed to get chain addresses", "err", err)
-			return ab, err
-		}
-		chainState, err := LoadChainState(chain, chainAddresses)
-		if err != nil {
-			e.Logger.Errorw("Failed to load chain state", "err", err)
-			return ab, err
-		}
-		// Enable ramps on price registry/nonce manager
-		tx, err := chainState.PriceRegistry.ApplyAuthorizedCallerUpdates(chain.DeployerKey, price_registry.AuthorizedCallersAuthorizedCallerArgs{
-			// TODO: We enable the deployer initially to set prices
-			AddedCallers: []common.Address{chainState.EvmOffRampV160.Address(), chain.DeployerKey.From},
-		})
-		if err := deployment.ConfirmIfNoError(chain, tx, err); err != nil {
-			e.Logger.Errorw("Failed to confirm price registry authorized caller update", "err", err)
-			return ab, err
-		}
-
-		tx, err = chainState.NonceManager.ApplyAuthorizedCallerUpdates(chain.DeployerKey, nonce_manager.AuthorizedCallersAuthorizedCallerArgs{
-			AddedCallers: []common.Address{chainState.EvmOffRampV160.Address(), chainState.EvmOnRampV160.Address()},
-		})
-		if err := deployment.ConfirmIfNoError(chain, tx, err); err != nil {
-			e.Logger.Errorw("Failed to update nonce manager with ramps", "err", err)
-			return ab, err
-		}
-
-		// Add chain config for each chain.
-		_, err = AddChainConfig(e.Logger,
-			e.Chains[c.HomeChainSel],
-			c.Chains[c.HomeChainSel].CCIPConfig,
-			chain.Selector,
-			nodes.PeerIDs(chain.Selector),
-			uint8(len(nodes)/3))
-		if err != nil {
-			return ab, err
-		}
-
-		// For each chain, we create a DON on the home chain.
-		if err := AddDON(e.Logger,
-			cr,
-			c.Chains[c.HomeChainSel].CapabilityRegistry,
-			c.Chains[c.HomeChainSel].CCIPConfig,
-			chainState.EvmOffRampV160,
-			chain,
-			e.Chains[c.HomeChainSel],
-			uint8(len(nodes)/3),
-			nodes.BootstrapPeerIDs(chain.Selector)[0],
-			nodes.PeerIDs(chain.Selector),
-			nodes,
-		); err != nil {
-			e.Logger.Errorw("Failed to add DON", "err", err)
-			return ab, err
-		}
-	}
-
-	return ab, nil
-}
-
-func DeployChainContracts(e deployment.Environment, chain deployment.Chain, ab deployment.AddressBook) (deployment.AddressBook, error) {
-	ccipReceiver, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*maybe_revert_message_receiver.MaybeRevertMessageReceiver] {
-			receiverAddr, tx, receiver, err2 := maybe_revert_message_receiver.DeployMaybeRevertMessageReceiver(
-				chain.DeployerKey,
-				chain.Client,
-				false,
-			)
-			return ContractDeploy[*maybe_revert_message_receiver.MaybeRevertMessageReceiver]{
-				receiverAddr, receiver, tx, deployment.NewTypeAndVersion(CCIPReceiver, deployment.Version1_0_0), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy receiver", "err", err)
-		return ab, err
-	}
-	e.Logger.Infow("deployed receiver", "addr", ccipReceiver.Address)
-
-	// TODO: Still waiting for RMNRemote/RMNHome contracts etc.
-	mockARM, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*mock_rmn_contract.MockRMNContract] {
-			mockARMAddr, tx, mockARM, err2 := mock_rmn_contract.DeployMockRMNContract(
-				chain.DeployerKey,
-				chain.Client,
-			)
-			return ContractDeploy[*mock_rmn_contract.MockRMNContract]{
-				mockARMAddr, mockARM, tx, deployment.NewTypeAndVersion(MockARM, deployment.Version1_0_0), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy mockARM", "err", err)
-		return ab, err
-	}
-	e.Logger.Infow("deployed mockARM", "addr", mockARM)
-
-	mcm, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*owner_helpers.ManyChainMultiSig] {
-			mcmAddr, tx, mcm, err2 := owner_helpers.DeployManyChainMultiSig(
-				chain.DeployerKey,
-				chain.Client,
-			)
-			return ContractDeploy[*owner_helpers.ManyChainMultiSig]{
-				mcmAddr, mcm, tx, deployment.NewTypeAndVersion(ManyChainMultisig, deployment.Version1_0_0), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy mcm", "err", err)
-		return ab, err
-	}
-	// TODO: Address soon
-	e.Logger.Infow("deployed mcm", "addr", mcm.Address)
-
-	_, err = deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*owner_helpers.RBACTimelock] {
-			timelock, tx, cc, err2 := owner_helpers.DeployRBACTimelock(
-				chain.DeployerKey,
-				chain.Client,
-				big.NewInt(0), // minDelay
-				mcm.Address,
-				[]common.Address{mcm.Address},            // proposers
-				[]common.Address{chain.DeployerKey.From}, //executors
-				[]common.Address{mcm.Address},            // cancellers
-				[]common.Address{mcm.Address},            // bypassers
-			)
-			return ContractDeploy[*owner_helpers.RBACTimelock]{
-				timelock, cc, tx, deployment.NewTypeAndVersion(RBACTimelock, deployment.Version1_0_0), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy timelock", "err", err)
-		return ab, err
-	}
-	e.Logger.Infow("deployed timelock", "addr", mcm.Address)
-
-	rmnProxy, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*rmn_proxy_contract.RMNProxyContract] {
-			rmnProxyAddr, tx, rmnProxy, err2 := rmn_proxy_contract.DeployRMNProxyContract(
-				chain.DeployerKey,
-				chain.Client,
-				mockARM.Address,
-			)
-			return ContractDeploy[*rmn_proxy_contract.RMNProxyContract]{
-				rmnProxyAddr, rmnProxy, tx, deployment.NewTypeAndVersion(ARMProxy, deployment.Version1_0_0), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy rmnProxy", "err", err)
-		return ab, err
-	}
-	e.Logger.Infow("deployed rmnProxy", "addr", rmnProxy.Address)
-
-	weth9, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*weth9.WETH9] {
-			weth9Addr, tx, weth9c, err2 := weth9.DeployWETH9(
-				chain.DeployerKey,
-				chain.Client,
-			)
-			return ContractDeploy[*weth9.WETH9]{
-				weth9Addr, weth9c, tx, deployment.NewTypeAndVersion(WETH9, deployment.Version1_0_0), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy weth9", "err", err)
-		return ab, err
-	}
-
-	linkToken, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*burn_mint_erc677.BurnMintERC677] {
-			linkTokenAddr, tx, linkToken, err2 := burn_mint_erc677.DeployBurnMintERC677(
-				chain.DeployerKey,
-				chain.Client,
-				"Link Token",
-				"LINK",
-				uint8(18),
-				big.NewInt(0).Mul(big.NewInt(1e9), big.NewInt(1e18)),
-			)
-			return ContractDeploy[*burn_mint_erc677.BurnMintERC677]{
-				linkTokenAddr, linkToken, tx, deployment.NewTypeAndVersion(LinkToken, deployment.Version1_0_0), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy linkToken", "err", err)
-		return ab, err
-	}
-
-	routerContract, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*router.Router] {
-			routerAddr, tx, routerC, err2 := router.DeployRouter(
-				chain.DeployerKey,
-				chain.Client,
-				weth9.Address,
-				rmnProxy.Address,
-			)
-			return ContractDeploy[*router.Router]{
-				routerAddr, routerC, tx, deployment.NewTypeAndVersion(Router, deployment.Version1_2_0), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy router", "err", err)
-		return ab, err
-	}
-	e.Logger.Infow("deployed router", "addr", routerContract)
-
-	tokenAdminRegistry, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*token_admin_registry.TokenAdminRegistry] {
-			tokenAdminRegistryAddr, tx, tokenAdminRegistry, err2 := token_admin_registry.DeployTokenAdminRegistry(
-				chain.DeployerKey,
-				chain.Client)
-			return ContractDeploy[*token_admin_registry.TokenAdminRegistry]{
-				tokenAdminRegistryAddr, tokenAdminRegistry, tx, deployment.NewTypeAndVersion(TokenAdminRegistry, deployment.Version1_5_0), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy token admin registry", "err", err)
-		return ab, err
-	}
-	e.Logger.Infow("deployed tokenAdminRegistry", "addr", tokenAdminRegistry)
-
-	nonceManager, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*nonce_manager.NonceManager] {
-			nonceManagerAddr, tx, nonceManager, err2 := nonce_manager.DeployNonceManager(
-				chain.DeployerKey,
-				chain.Client,
-				[]common.Address{}, // Need to add onRamp after
-			)
-			return ContractDeploy[*nonce_manager.NonceManager]{
-				nonceManagerAddr, nonceManager, tx, deployment.NewTypeAndVersion(NonceManager, deployment.Version1_6_0_dev), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy router", "err", err)
-		return ab, err
-	}
-
-	priceRegistry, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*price_registry.PriceRegistry] {
-			prAddr, tx, pr, err2 := price_registry.DeployPriceRegistry(
-				chain.DeployerKey,
-				chain.Client,
-				price_registry.PriceRegistryStaticConfig{
-					MaxFeeJuelsPerMsg:  big.NewInt(0).Mul(big.NewInt(2e2), big.NewInt(1e18)),
-					LinkToken:          linkToken.Address,
-					StalenessThreshold: uint32(24 * 60 * 60),
-				},
-				[]common.Address{}, // ramps added after
-				[]common.Address{weth9.Address, linkToken.Address}, // fee tokens
-				[]price_registry.PriceRegistryTokenPriceFeedUpdate{},
-				[]price_registry.PriceRegistryTokenTransferFeeConfigArgs{}, // TODO: tokens
-				[]price_registry.PriceRegistryPremiumMultiplierWeiPerEthArgs{
-					{
-						PremiumMultiplierWeiPerEth: 9e17, // 0.9 ETH
-						Token:                      linkToken.Address,
-					},
-					{
-						PremiumMultiplierWeiPerEth: 1e18,
-						Token:                      weth9.Address,
-					},
-				},
-				[]price_registry.PriceRegistryDestChainConfigArgs{},
-			)
-			return ContractDeploy[*price_registry.PriceRegistry]{
-				prAddr, pr, tx, deployment.NewTypeAndVersion(PriceRegistry, deployment.Version1_6_0_dev), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy price registry", "err", err)
-		return ab, err
-	}
-
-	onRamp, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*onramp.OnRamp] {
-			onRampAddr, tx, onRamp, err2 := onramp.DeployOnRamp(
-				chain.DeployerKey,
-				chain.Client,
-				onramp.OnRampStaticConfig{
-					ChainSelector:      chain.Selector,
-					RmnProxy:           rmnProxy.Address,
-					NonceManager:       nonceManager.Address,
-					TokenAdminRegistry: tokenAdminRegistry.Address,
-				},
-				onramp.OnRampDynamicConfig{
-					PriceRegistry: priceRegistry.Address,
-					FeeAggregator: common.HexToAddress("0x1"), // TODO real fee aggregator
-				},
-				[]onramp.OnRampDestChainConfigArgs{},
-			)
-			return ContractDeploy[*onramp.OnRamp]{
-				onRampAddr, onRamp, tx, deployment.NewTypeAndVersion(OnRamp, deployment.Version1_6_0_dev), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy onramp", "err", err)
-		return ab, err
-	}
-	e.Logger.Infow("deployed onramp", "addr", onRamp.Address)
-
-	offRamp, err := deployContract(e.Logger, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*offramp.OffRamp] {
-			offRampAddr, tx, offRamp, err2 := offramp.DeployOffRamp(
-				chain.DeployerKey,
-				chain.Client,
-				offramp.OffRampStaticConfig{
-					ChainSelector:      chain.Selector,
-					RmnProxy:           rmnProxy.Address,
-					NonceManager:       nonceManager.Address,
-					TokenAdminRegistry: tokenAdminRegistry.Address,
-				},
-				offramp.OffRampDynamicConfig{
-					PriceRegistry:                           priceRegistry.Address,
-					PermissionLessExecutionThresholdSeconds: uint32(86400),
-					MaxTokenTransferGas:                     uint32(200_000),
-					MaxPoolReleaseOrMintGas:                 uint32(200_000),
-				},
-				[]offramp.OffRampSourceChainConfigArgs{},
-			)
-			return ContractDeploy[*offramp.OffRamp]{
-				offRampAddr, offRamp, tx, deployment.NewTypeAndVersion(OffRamp, deployment.Version1_6_0_dev), err2,
-			}
-		})
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy offramp", "err", err)
-		return ab, err
-	}
-	e.Logger.Infow("deployed offramp", "addr", offRamp)
-	return ab, nil
-}
diff --git a/integration-tests/deployment/ccip/deploy_home_chain.go b/integration-tests/deployment/ccip/deploy_home_chain.go
deleted file mode 100644
index 10e7e9552b..0000000000
--- a/integration-tests/deployment/ccip/deploy_home_chain.go
+++ /dev/null
@@ -1,401 +0,0 @@
-package ccipdeployment
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"sort"
-	"time"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	confighelper2 "github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3confighelper"
-
-	"github.com/smartcontractkit/chainlink-ccip/chainconfig"
-	"github.com/smartcontractkit/chainlink-ccip/pluginconfig"
-	commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config"
-	"github.com/smartcontractkit/chainlink-common/pkg/logger"
-	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ocr3_config_encoder"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-)
-
-const (
-	NodeOperatorID         = 1
-	CapabilityLabelledName = "ccip"
-	CapabilityVersion      = "v1.0.0"
-
-	FirstBlockAge                           = 8 * time.Hour
-	RemoteGasPriceBatchWriteFrequency       = 30 * time.Minute
-	BatchGasLimit                           = 6_500_000
-	RelativeBoostPerWaitHour                = 1.5
-	InflightCacheExpiry                     = 10 * time.Minute
-	RootSnoozeTime                          = 30 * time.Minute
-	BatchingStrategyID                      = 0
-	DeltaProgress                           = 30 * time.Second
-	DeltaResend                             = 10 * time.Second
-	DeltaInitial                            = 20 * time.Second
-	DeltaRound                              = 2 * time.Second
-	DeltaGrace                              = 2 * time.Second
-	DeltaCertifiedCommitRequest             = 10 * time.Second
-	DeltaStage                              = 10 * time.Second
-	Rmax                                    = 3
-	MaxDurationQuery                        = 50 * time.Millisecond
-	MaxDurationObservation                  = 5 * time.Second
-	MaxDurationShouldAcceptAttestedReport   = 10 * time.Second
-	MaxDurationShouldTransmitAcceptedReport = 10 * time.Second
-)
-
-func DeployCapReg(lggr logger.Logger, chains map[uint64]deployment.Chain, chainSel uint64) (deployment.AddressBook, common.Address, error) {
-	ab := deployment.NewMemoryAddressBook()
-	chain := chains[chainSel]
-	capReg, err := deployContract(lggr, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*capabilities_registry.CapabilitiesRegistry] {
-			crAddr, tx, cr, err2 := capabilities_registry.DeployCapabilitiesRegistry(
-				chain.DeployerKey,
-				chain.Client,
-			)
-			return ContractDeploy[*capabilities_registry.CapabilitiesRegistry]{
-				Address: crAddr, Contract: cr, Tv: deployment.NewTypeAndVersion(CapabilitiesRegistry, deployment.Version1_0_0), Tx: tx, Err: err2,
-			}
-		})
-	if err != nil {
-		lggr.Errorw("Failed to deploy capreg", "err", err)
-		return ab, common.Address{}, err
-	}
-	lggr.Infow("deployed capreg", "addr", capReg.Address)
-	ccipConfig, err := deployContract(
-		lggr, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*ccip_config.CCIPConfig] {
-			ccAddr, tx, cc, err2 := ccip_config.DeployCCIPConfig(
-				chain.DeployerKey,
-				chain.Client,
-				capReg.Address,
-			)
-			return ContractDeploy[*ccip_config.CCIPConfig]{
-				Address: ccAddr, Tv: deployment.NewTypeAndVersion(CCIPConfig, deployment.Version1_6_0_dev), Tx: tx, Err: err2, Contract: cc,
-			}
-		})
-	if err != nil {
-		lggr.Errorw("Failed to deploy ccip config", "err", err)
-		return ab, common.Address{}, err
-	}
-	lggr.Infow("deployed ccip config", "addr", ccipConfig.Address)
-
-	tx, err := capReg.Contract.AddCapabilities(chain.DeployerKey, []capabilities_registry.CapabilitiesRegistryCapability{
-		{
-			LabelledName:          CapabilityLabelledName,
-			Version:               CapabilityVersion,
-			CapabilityType:        2, // consensus. not used (?)
-			ResponseType:          0, // report. not used (?)
-			ConfigurationContract: ccipConfig.Address,
-		},
-	})
-	if err := deployment.ConfirmIfNoError(chain, tx, err); err != nil {
-		lggr.Errorw("Failed to add capabilities", "err", err)
-		return ab, common.Address{}, err
-	}
-	// TODO: Just one for testing.
-	tx, err = capReg.Contract.AddNodeOperators(chain.DeployerKey, []capabilities_registry.CapabilitiesRegistryNodeOperator{
-		{
-			Admin: chain.DeployerKey.From,
-			Name:  "NodeOperator",
-		},
-	})
-	if err := deployment.ConfirmIfNoError(chain, tx, err); err != nil {
-		lggr.Errorw("Failed to add node operators", "err", err)
-		return ab, common.Address{}, err
-	}
-	return ab, capReg.Address, nil
-}
-
-func sortP2PIDS(p2pIDs [][32]byte) {
-	sort.Slice(p2pIDs, func(i, j int) bool {
-		return bytes.Compare(p2pIDs[i][:], p2pIDs[j][:]) < 0
-	})
-}
-
-func AddNodes(
-	capReg *capabilities_registry.CapabilitiesRegistry,
-	chain deployment.Chain,
-	p2pIDs [][32]byte,
-	capabilityIDs [][32]byte,
-) error {
-	// Need to sort, otherwise _checkIsValidUniqueSubset onChain will fail
-	sortP2PIDS(p2pIDs)
-	var nodeParams []capabilities_registry.CapabilitiesRegistryNodeParams
-	for _, p2pID := range p2pIDs {
-		nodeParam := capabilities_registry.CapabilitiesRegistryNodeParams{
-			NodeOperatorId:      NodeOperatorID,
-			Signer:              p2pID, // Not used in tests
-			P2pId:               p2pID,
-			HashedCapabilityIds: capabilityIDs,
-		}
-		nodeParams = append(nodeParams, nodeParam)
-	}
-	tx, err := capReg.AddNodes(chain.DeployerKey, nodeParams)
-	if err != nil {
-		return err
-	}
-	return chain.Confirm(tx.Hash())
-}
-
-func SetupConfigInfo(chainSelector uint64, readers [][32]byte, fChain uint8, cfg []byte) ccip_config.CCIPConfigTypesChainConfigInfo {
-	return ccip_config.CCIPConfigTypesChainConfigInfo{
-		ChainSelector: chainSelector,
-		ChainConfig: ccip_config.CCIPConfigTypesChainConfig{
-			Readers: readers,
-			FChain:  fChain,
-			Config:  cfg,
-		},
-	}
-}
-
-func AddChainConfig(
-	lggr logger.Logger,
-	h deployment.Chain,
-	ccipConfig *ccip_config.CCIPConfig,
-	chainSelector uint64,
-	p2pIDs [][32]byte,
-	f uint8,
-) (ccip_config.CCIPConfigTypesChainConfigInfo, error) {
-	// Need to sort, otherwise _checkIsValidUniqueSubset onChain will fail
-	sortP2PIDS(p2pIDs)
-	// First Add ChainConfig that includes all p2pIDs as readers
-	encodedExtraChainConfig, err := chainconfig.EncodeChainConfig(chainconfig.ChainConfig{
-		GasPriceDeviationPPB:    ccipocr3.NewBigIntFromInt64(1000),
-		DAGasPriceDeviationPPB:  ccipocr3.NewBigIntFromInt64(0),
-		FinalityDepth:           10,
-		OptimisticConfirmations: 1,
-	})
-	if err != nil {
-		return ccip_config.CCIPConfigTypesChainConfigInfo{}, err
-	}
-	chainConfig := SetupConfigInfo(chainSelector, p2pIDs, f, encodedExtraChainConfig)
-	inputConfig := []ccip_config.CCIPConfigTypesChainConfigInfo{
-		chainConfig,
-	}
-	tx, err := ccipConfig.ApplyChainConfigUpdates(h.DeployerKey, nil, inputConfig)
-	if err := deployment.ConfirmIfNoError(h, tx, err); err != nil {
-		return ccip_config.CCIPConfigTypesChainConfigInfo{}, err
-	}
-	lggr.Infow("Applied chain config updates", "chainConfig", chainConfig)
-	return chainConfig, nil
-}
-
-func AddDON(
-	lggr logger.Logger,
-	ccipCapabilityID [32]byte,
-	capReg *capabilities_registry.CapabilitiesRegistry,
-	ccipConfig *ccip_config.CCIPConfig,
-	offRamp *offramp.OffRamp,
-	dest deployment.Chain,
-	home deployment.Chain,
-	f uint8,
-	bootstrapP2PID [32]byte,
-	p2pIDs [][32]byte,
-	nodes []deployment.Node,
-) error {
-	sortP2PIDS(p2pIDs)
-	// Get OCR3 Config from helper
-	var schedule []int
-	var oracles []confighelper2.OracleIdentityExtra
-	for _, node := range nodes {
-		schedule = append(schedule, 1)
-		cfg := node.SelToOCRConfig[dest.Selector]
-		oracles = append(oracles, confighelper2.OracleIdentityExtra{
-			OracleIdentity: confighelper2.OracleIdentity{
-				OnchainPublicKey:  cfg.OnchainPublicKey,
-				TransmitAccount:   cfg.TransmitAccount,
-				OffchainPublicKey: cfg.OffchainPublicKey,
-				PeerID:            cfg.PeerID.String()[4:],
-			}, ConfigEncryptionPublicKey: cfg.ConfigEncryptionPublicKey,
-		})
-	}
-
-	tabi, err := ocr3_config_encoder.IOCR3ConfigEncoderMetaData.GetAbi()
-	if err != nil {
-		return err
-	}
-
-	// Add DON on capability registry contract
-	var ocr3Configs []ocr3_config_encoder.CCIPConfigTypesOCR3Config
-	for _, pluginType := range []cctypes.PluginType{cctypes.PluginTypeCCIPCommit, cctypes.PluginTypeCCIPExec} {
-		var encodedOffchainConfig []byte
-		var err2 error
-		if pluginType == cctypes.PluginTypeCCIPCommit {
-			encodedOffchainConfig, err2 = pluginconfig.EncodeCommitOffchainConfig(pluginconfig.CommitOffchainConfig{
-				RemoteGasPriceBatchWriteFrequency: *commonconfig.MustNewDuration(RemoteGasPriceBatchWriteFrequency),
-				// TODO: implement token price writes
-				// TokenPriceBatchWriteFrequency:     *commonconfig.MustNewDuration(tokenPriceBatchWriteFrequency),
-			})
-		} else {
-			encodedOffchainConfig, err2 = pluginconfig.EncodeExecuteOffchainConfig(pluginconfig.ExecuteOffchainConfig{
-				BatchGasLimit:             BatchGasLimit,
-				RelativeBoostPerWaitHour:  RelativeBoostPerWaitHour,
-				MessageVisibilityInterval: *commonconfig.MustNewDuration(FirstBlockAge),
-				InflightCacheExpiry:       *commonconfig.MustNewDuration(InflightCacheExpiry),
-				RootSnoozeTime:            *commonconfig.MustNewDuration(RootSnoozeTime),
-				BatchingStrategyID:        BatchingStrategyID,
-			})
-		}
-		if err2 != nil {
-			return err2
-		}
-		signers, transmitters, configF, _, offchainConfigVersion, offchainConfig, err2 := ocr3confighelper.ContractSetConfigArgsForTests(
-			DeltaProgress,
-			DeltaResend,
-			DeltaInitial,
-			DeltaRound,
-			DeltaGrace,
-			DeltaCertifiedCommitRequest,
-			DeltaStage,
-			Rmax,
-			schedule,
-			oracles,
-			encodedOffchainConfig,
-			MaxDurationQuery,
-			MaxDurationObservation,
-			MaxDurationShouldAcceptAttestedReport,
-			MaxDurationShouldTransmitAcceptedReport,
-			int(f),
-			[]byte{}, // empty OnChainConfig
-		)
-		if err2 != nil {
-			return err2
-		}
-
-		signersBytes := make([][]byte, len(signers))
-		for i, signer := range signers {
-			signersBytes[i] = signer
-		}
-
-		transmittersBytes := make([][]byte, len(transmitters))
-		for i, transmitter := range transmitters {
-			parsed, err2 := common.ParseHexOrString(string(transmitter))
-			if err2 != nil {
-				return err2
-			}
-			transmittersBytes[i] = parsed
-		}
-
-		ocr3Configs = append(ocr3Configs, ocr3_config_encoder.CCIPConfigTypesOCR3Config{
-			PluginType:            uint8(pluginType),
-			ChainSelector:         dest.Selector,
-			F:                     configF,
-			OffchainConfigVersion: offchainConfigVersion,
-			OfframpAddress:        offRamp.Address().Bytes(),
-			BootstrapP2PIds:       [][32]byte{bootstrapP2PID},
-			P2pIds:                p2pIDs,
-			Signers:               signersBytes,
-			Transmitters:          transmittersBytes,
-			OffchainConfig:        offchainConfig,
-		})
-	}
-
-	encodedCall, err := tabi.Pack("exposeOCR3Config", ocr3Configs)
-	if err != nil {
-		return err
-	}
-
-	// Trim first four bytes to remove function selector.
-	encodedConfigs := encodedCall[4:]
-
-	tx, err := capReg.AddDON(home.DeployerKey, p2pIDs, []capabilities_registry.CapabilitiesRegistryCapabilityConfiguration{
-		{
-			CapabilityId: ccipCapabilityID,
-			Config:       encodedConfigs,
-		},
-	}, false, false, f)
-	if err := deployment.ConfirmIfNoError(home, tx, err); err != nil {
-		return err
-	}
-
-	latestBlock, err := home.Client.HeaderByNumber(context.Background(), nil)
-	if err != nil {
-		return err
-	}
-	endBlock := latestBlock.Number.Uint64()
-	iter, err := capReg.FilterConfigSet(&bind.FilterOpts{
-		Start: endBlock - 1,
-		End:   &endBlock,
-	})
-	if err != nil {
-		return err
-	}
-	var donID uint32
-	for iter.Next() {
-		donID = iter.Event.DonId
-		break
-	}
-	if donID == 0 {
-		return errors.New("failed to get donID")
-	}
-
-	var signerAddresses []common.Address
-	for _, oracle := range oracles {
-		signerAddresses = append(signerAddresses, common.BytesToAddress(oracle.OnchainPublicKey))
-	}
-
-	var transmitterAddresses []common.Address
-	for _, oracle := range oracles {
-		transmitterAddresses = append(transmitterAddresses, common.HexToAddress(string(oracle.TransmitAccount)))
-	}
-
-	// get the config digest from the ccip config contract and set config on the offramp.
-	var offrampOCR3Configs []offramp.MultiOCR3BaseOCRConfigArgs
-	for _, pluginType := range []cctypes.PluginType{cctypes.PluginTypeCCIPCommit, cctypes.PluginTypeCCIPExec} {
-		ocrConfig, err2 := ccipConfig.GetOCRConfig(&bind.CallOpts{
-			Context: context.Background(),
-		}, donID, uint8(pluginType))
-		if err2 != nil {
-			return err2
-		}
-		if len(ocrConfig) != 1 {
-			return errors.New("expected exactly one OCR3 config")
-		}
-
-		offrampOCR3Configs = append(offrampOCR3Configs, offramp.MultiOCR3BaseOCRConfigArgs{
-			ConfigDigest:                   ocrConfig[0].ConfigDigest,
-			OcrPluginType:                  uint8(pluginType),
-			F:                              f,
-			IsSignatureVerificationEnabled: pluginType == cctypes.PluginTypeCCIPCommit,
-			Signers:                        signerAddresses,
-			Transmitters:                   transmitterAddresses,
-		})
-	}
-
-	tx, err = offRamp.SetOCR3Configs(dest.DeployerKey, offrampOCR3Configs)
-	if err := deployment.ConfirmIfNoError(dest, tx, err); err != nil {
-		return err
-	}
-
-	for _, pluginType := range []cctypes.PluginType{cctypes.PluginTypeCCIPCommit, cctypes.PluginTypeCCIPExec} {
-		_, err = offRamp.LatestConfigDetails(&bind.CallOpts{
-			Context: context.Background(),
-		}, uint8(pluginType))
-		if err != nil {
-			//return err
-			return deployment.MaybeDataErr(err)
-		}
-		// TODO: assertions to be done as part of full state
-		// resprentation validation CCIP-3047
-		//require.Equalf(t, offrampOCR3Configs[pluginType].ConfigDigest, ocrConfig.ConfigInfo.ConfigDigest, "%s OCR3 config digest mismatch", pluginType.String())
-		//require.Equalf(t, offrampOCR3Configs[pluginType].F, ocrConfig.ConfigInfo.F, "%s OCR3 config F mismatch", pluginType.String())
-		//require.Equalf(t, offrampOCR3Configs[pluginType].IsSignatureVerificationEnabled, ocrConfig.ConfigInfo.IsSignatureVerificationEnabled, "%s OCR3 config signature verification mismatch", pluginType.String())
-		//if pluginType == cctypes.PluginTypeCCIPCommit {
-		//	// only commit will set signers, exec doesn't need them.
-		//	require.Equalf(t, offrampOCR3Configs[pluginType].Signers, ocrConfig.Signers, "%s OCR3 config signers mismatch", pluginType.String())
-		//}
-		//require.Equalf(t, offrampOCR3Configs[pluginType].TransmittersByEVMChainID, ocrConfig.TransmittersByEVMChainID, "%s OCR3 config transmitters mismatch", pluginType.String())
-	}
-
-	lggr.Infof("set ocr3 config on the offramp, signers: %+v, transmitters: %+v", signerAddresses, transmitterAddresses)
-	return nil
-}
diff --git a/integration-tests/deployment/ccip/deploy_test.go b/integration-tests/deployment/ccip/deploy_test.go
deleted file mode 100644
index 7bc56f82f7..0000000000
--- a/integration-tests/deployment/ccip/deploy_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package ccipdeployment
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap/zapcore"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/memory"
-
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-)
-
-func TestDeployCCIPContracts(t *testing.T) {
-	lggr := logger.TestLogger(t)
-	e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
-		Bootstraps: 1,
-		Chains:     1,
-		Nodes:      4,
-	})
-	// Deploy all the CCIP contracts.
-	homeChain := e.AllChainSelectors()[0]
-	capRegAddresses, _, err := DeployCapReg(lggr, e.Chains, homeChain)
-	require.NoError(t, err)
-	s, err := LoadOnchainState(e, capRegAddresses)
-	require.NoError(t, err)
-	ab, err := DeployCCIPContracts(e, DeployCCIPContractConfig{
-		HomeChainSel:     homeChain,
-		CCIPOnChainState: s,
-	})
-	require.NoError(t, err)
-	state, err := LoadOnchainState(e, ab)
-	require.NoError(t, err)
-	snap, err := state.Snapshot(e.AllChainSelectors())
-	require.NoError(t, err)
-
-	// Assert expect every deployed address to be in the address book.
-	// TODO (CCIP-3047): Add the rest of CCIPv2 representation
-	b, err := json.MarshalIndent(snap, "", "	")
-	require.NoError(t, err)
-	fmt.Println(string(b))
-}
-
-func TestJobSpecGeneration(t *testing.T) {
-	lggr := logger.TestLogger(t)
-	e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
-		Chains: 1,
-		Nodes:  1,
-	})
-	js, err := NewCCIPJobSpecs(e.NodeIDs, e.Offchain)
-	require.NoError(t, err)
-	for node, jb := range js {
-		fmt.Println(node, jb)
-	}
-	// TODO: Add job assertions
-}
diff --git a/integration-tests/deployment/ccip/jobs.go b/integration-tests/deployment/ccip/jobs.go
deleted file mode 100644
index f45fe4c553..0000000000
--- a/integration-tests/deployment/ccip/jobs.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package ccipdeployment
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	nodev1 "github.com/smartcontractkit/chainlink/integration-tests/deployment/jd/node/v1"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/validate"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
-)
-
-// In our case, the only address needed is the cap registry which is actually an env var.
-// and will pre-exist for our deployment. So the job specs only depend on the environment operators.
-func NewCCIPJobSpecs(nodeIds []string, oc deployment.OffchainClient) (map[string][]string, error) {
-	// Generate a set of brand new job specs for CCIP for a specific environment
-	// (including NOPs) and new addresses.
-	// We want to assign one CCIP capability job to each node. And node with
-	// an addr we'll list as bootstrapper.
-	// Find the bootstrap nodes
-	bootstrapMp := make(map[string]struct{})
-	for _, node := range nodeIds {
-		// TODO: Filter should accept multiple nodes
-		nodeChainConfigs, err := oc.ListNodeChainConfigs(context.Background(), &nodev1.ListNodeChainConfigsRequest{Filter: &nodev1.ListNodeChainConfigsRequest_Filter{
-			NodeId: node,
-		}})
-		if err != nil {
-			return nil, err
-		}
-		for _, chainConfig := range nodeChainConfigs.ChainConfigs {
-			if chainConfig.Ocr2Config.IsBootstrap {
-				bootstrapMp[fmt.Sprintf("%s@%s",
-					// p2p_12D3... -> 12D3...
-					chainConfig.Ocr2Config.P2PKeyBundle.PeerId[4:], chainConfig.Ocr2Config.Multiaddr)] = struct{}{}
-			}
-		}
-	}
-	var bootstraps []string
-	for b := range bootstrapMp {
-		bootstraps = append(bootstraps, b)
-	}
-	nodesToJobSpecs := make(map[string][]string)
-	for _, node := range nodeIds {
-		// TODO: Filter should accept multiple.
-		nodeChainConfigs, err := oc.ListNodeChainConfigs(context.Background(), &nodev1.ListNodeChainConfigsRequest{Filter: &nodev1.ListNodeChainConfigsRequest_Filter{
-			NodeId: node,
-		}})
-		if err != nil {
-			return nil, err
-		}
-		spec, err := validate.NewCCIPSpecToml(validate.SpecArgs{
-			P2PV2Bootstrappers:     bootstraps,
-			CapabilityVersion:      CapabilityVersion,
-			CapabilityLabelledName: CapabilityLabelledName,
-			OCRKeyBundleIDs: map[string]string{
-				// TODO: Validate that that all EVM chains are using the same keybundle.
-				relay.NetworkEVM: nodeChainConfigs.ChainConfigs[0].Ocr2Config.OcrKeyBundle.BundleId,
-			},
-			// TODO: validate that all EVM chains are using the same keybundle
-			P2PKeyID:     nodeChainConfigs.ChainConfigs[0].Ocr2Config.P2PKeyBundle.PeerId,
-			RelayConfigs: nil,
-			PluginConfig: map[string]any{},
-		})
-		if err != nil {
-			return nil, err
-		}
-		nodesToJobSpecs[node] = append(nodesToJobSpecs[node], spec)
-	}
-	return nodesToJobSpecs, nil
-}
diff --git a/integration-tests/deployment/ccip/propose.go b/integration-tests/deployment/ccip/propose.go
deleted file mode 100644
index 4fc38965ea..0000000000
--- a/integration-tests/deployment/ccip/propose.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package ccipdeployment
-
-import (
-	"math/big"
-	"time"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	owner_helpers "github.com/smartcontractkit/ccip-owner-contracts/gethwrappers"
-	chainsel "github.com/smartcontractkit/chain-selectors"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-)
-
-// TODO: Pull up to deploy
-func SimTransactOpts() *bind.TransactOpts {
-	return &bind.TransactOpts{Signer: func(address common.Address, transaction *types.Transaction) (*types.Transaction, error) {
-		return transaction, nil
-	}, From: common.HexToAddress("0x0"), NoSend: true, GasLimit: 200_000}
-}
-
-func GenerateAcceptOwnershipProposal(
-	e deployment.Environment,
-	chains []uint64,
-	ab deployment.AddressBook,
-) (deployment.Proposal, error) {
-	state, err := LoadOnchainState(e, ab)
-	if err != nil {
-		return deployment.Proposal{}, err
-	}
-	// TODO: Just onramp as an example
-	var ops []owner_helpers.ManyChainMultiSigOp
-	for _, sel := range chains {
-		opCount, err := state.Chains[sel].Mcm.GetOpCount(nil)
-		if err != nil {
-			return deployment.Proposal{}, err
-		}
-
-		txData, err := state.Chains[sel].EvmOnRampV160.AcceptOwnership(SimTransactOpts())
-		if err != nil {
-			return deployment.Proposal{}, err
-		}
-		evmID, err := chainsel.ChainIdFromSelector(sel)
-		if err != nil {
-			return deployment.Proposal{}, err
-		}
-		ops = append(ops, owner_helpers.ManyChainMultiSigOp{
-			ChainId:  big.NewInt(int64(evmID)),
-			MultiSig: state.Chains[sel].McmsAddr,
-			Nonce:    opCount,
-			To:       state.Chains[sel].EvmOnRampV160.Address(),
-			Value:    big.NewInt(0),
-			Data:     txData.Data(),
-		})
-	}
-	// TODO: Real valid until.
-	return deployment.Proposal{ValidUntil: uint32(time.Now().Unix()), Ops: ops}, nil
-}
-
-func ApplyProposal(env deployment.Environment, p deployment.Proposal, state CCIPOnChainState) error {
-	// TODO
-	return nil
-}
diff --git a/integration-tests/deployment/ccip/state.go b/integration-tests/deployment/ccip/state.go
deleted file mode 100644
index e9015dbfdc..0000000000
--- a/integration-tests/deployment/ccip/state.go
+++ /dev/null
@@ -1,276 +0,0 @@
-package ccipdeployment
-
-import (
-	"fmt"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/pkg/errors"
-	chainsel "github.com/smartcontractkit/chain-selectors"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/maybe_revert_message_receiver"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/shared/generated/burn_mint_erc677"
-
-	owner_wrappers "github.com/smartcontractkit/ccip-owner-contracts/gethwrappers"
-
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/mock_rmn_contract"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/nonce_manager"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_proxy_contract"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/token_admin_registry"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/weth9"
-)
-
-type CCIPChainState struct {
-	EvmOnRampV160      *onramp.OnRamp
-	EvmOffRampV160     *offramp.OffRamp
-	PriceRegistry      *price_registry.PriceRegistry
-	ArmProxy           *rmn_proxy_contract.RMNProxyContract
-	NonceManager       *nonce_manager.NonceManager
-	TokenAdminRegistry *token_admin_registry.TokenAdminRegistry
-	Router             *router.Router
-	Weth9              *weth9.WETH9
-	MockRmn            *mock_rmn_contract.MockRMNContract
-	// TODO: May need to support older link too
-	LinkToken *burn_mint_erc677.BurnMintERC677
-	// Note we only expect one of these (on the home chain)
-	CapabilityRegistry *capabilities_registry.CapabilitiesRegistry
-	CCIPConfig         *ccip_config.CCIPConfig
-	Mcm                *owner_wrappers.ManyChainMultiSig
-	// TODO: remove once we have Address() on wrappers
-	McmsAddr common.Address
-	Timelock *owner_wrappers.RBACTimelock
-
-	// Test contracts
-	Receiver *maybe_revert_message_receiver.MaybeRevertMessageReceiver
-}
-
-// Onchain state always derivable from an address book.
-// Offchain state always derivable from a list of nodeIds.
-// Note can translate this into Go struct needed for MCMS/Docs/UI.
-type CCIPOnChainState struct {
-	// Populated go bindings for the appropriate version for all contracts.
-	// We would hold 2 versions of each contract here. Once we upgrade we can phase out the old one.
-	// When generating bindings, make sure the package name corresponds to the version.
-	Chains map[uint64]CCIPChainState
-}
-
-type CCIPSnapShot struct {
-	Chains map[string]Chain `json:"chains"`
-}
-
-type Contract struct {
-	TypeAndVersion string         `json:"typeAndVersion"`
-	Address        common.Address `json:"address"`
-}
-
-type TokenAdminRegistryView struct {
-	Contract
-	Tokens []common.Address `json:"tokens"`
-}
-
-type NonceManagerView struct {
-	Contract
-	AuthorizedCallers []common.Address `json:"authorizedCallers"`
-}
-
-type Chain struct {
-	// TODO: this will have to be versioned for getting state during upgrades.
-	TokenAdminRegistry TokenAdminRegistryView `json:"tokenAdminRegistry"`
-	NonceManager       NonceManagerView       `json:"nonceManager"`
-}
-
-func (s CCIPOnChainState) Snapshot(chains []uint64) (CCIPSnapShot, error) {
-	snapshot := CCIPSnapShot{
-		Chains: make(map[string]Chain),
-	}
-	for _, chainSelector := range chains {
-		// TODO: Need a utility for this
-		chainid, err := chainsel.ChainIdFromSelector(chainSelector)
-		if err != nil {
-			return snapshot, err
-		}
-		chainName, err := chainsel.NameFromChainId(chainid)
-		if err != nil {
-			return snapshot, err
-		}
-		if _, ok := s.Chains[chainSelector]; !ok {
-			return snapshot, fmt.Errorf("chain not supported %d", chainSelector)
-		}
-		var c Chain
-		ta := s.Chains[chainSelector].TokenAdminRegistry
-		if ta != nil {
-			tokens, err := ta.GetAllConfiguredTokens(nil, 0, 10)
-			if err != nil {
-				return snapshot, err
-			}
-			tv, err := ta.TypeAndVersion(nil)
-			if err != nil {
-				return snapshot, err
-			}
-			c.TokenAdminRegistry = TokenAdminRegistryView{
-				Contract: Contract{
-					TypeAndVersion: tv,
-					Address:        ta.Address(),
-				},
-				Tokens: tokens,
-			}
-		}
-		nm := s.Chains[chainSelector].NonceManager
-		if nm != nil {
-			authorizedCallers, err := nm.GetAllAuthorizedCallers(nil)
-			if err != nil {
-				return snapshot, err
-			}
-			tv, err := nm.TypeAndVersion(nil)
-			if err != nil {
-				return snapshot, err
-			}
-			c.NonceManager = NonceManagerView{
-				Contract: Contract{
-					TypeAndVersion: tv,
-					Address:        nm.Address(),
-				},
-				// TODO: these can be resolved using an address book
-				AuthorizedCallers: authorizedCallers,
-			}
-		}
-		snapshot.Chains[chainName] = c
-	}
-	return snapshot, nil
-}
-
-func SnapshotState(e deployment.Environment, ab deployment.AddressBook) (CCIPSnapShot, error) {
-	state, err := LoadOnchainState(e, ab)
-	if err != nil {
-		return CCIPSnapShot{}, err
-	}
-	return state.Snapshot(e.AllChainSelectors())
-}
-
-func LoadOnchainState(e deployment.Environment, ab deployment.AddressBook) (CCIPOnChainState, error) {
-	state := CCIPOnChainState{
-		Chains: make(map[uint64]CCIPChainState),
-	}
-	addresses, err := ab.Addresses()
-	if err != nil {
-		return state, errors.Wrap(err, "could not get addresses")
-	}
-	for chainSelector, addresses := range addresses {
-		chainState, err := LoadChainState(e.Chains[chainSelector], addresses)
-		if err != nil {
-			return state, err
-		}
-		state.Chains[chainSelector] = chainState
-	}
-	return state, nil
-}
-
-// Loads all state for a chain into state
-// Modifies map in place
-func LoadChainState(chain deployment.Chain, addresses map[string]deployment.TypeAndVersion) (CCIPChainState, error) {
-	var state CCIPChainState
-	for address, tvStr := range addresses {
-		switch tvStr.String() {
-		case deployment.NewTypeAndVersion(RBACTimelock, deployment.Version1_0_0).String():
-			tl, err := owner_wrappers.NewRBACTimelock(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.Timelock = tl
-		case deployment.NewTypeAndVersion(ManyChainMultisig, deployment.Version1_0_0).String():
-			mcms, err := owner_wrappers.NewManyChainMultiSig(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.Mcm = mcms
-			state.McmsAddr = common.HexToAddress(address)
-		case deployment.NewTypeAndVersion(CapabilitiesRegistry, deployment.Version1_0_0).String():
-			cr, err := capabilities_registry.NewCapabilitiesRegistry(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.CapabilityRegistry = cr
-		case deployment.NewTypeAndVersion(OnRamp, deployment.Version1_6_0_dev).String():
-			onRampC, err := onramp.NewOnRamp(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.EvmOnRampV160 = onRampC
-		case deployment.NewTypeAndVersion(OffRamp, deployment.Version1_6_0_dev).String():
-			offRamp, err := offramp.NewOffRamp(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.EvmOffRampV160 = offRamp
-		case deployment.NewTypeAndVersion(ARMProxy, deployment.Version1_0_0).String():
-			armProxy, err := rmn_proxy_contract.NewRMNProxyContract(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.ArmProxy = armProxy
-		case deployment.NewTypeAndVersion(MockARM, deployment.Version1_0_0).String():
-			mockARM, err := mock_rmn_contract.NewMockRMNContract(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.MockRmn = mockARM
-		case deployment.NewTypeAndVersion(WETH9, deployment.Version1_0_0).String():
-			weth9, err := weth9.NewWETH9(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.Weth9 = weth9
-		case deployment.NewTypeAndVersion(NonceManager, deployment.Version1_6_0_dev).String():
-			nm, err := nonce_manager.NewNonceManager(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.NonceManager = nm
-		case deployment.NewTypeAndVersion(TokenAdminRegistry, deployment.Version1_5_0).String():
-			tm, err := token_admin_registry.NewTokenAdminRegistry(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.TokenAdminRegistry = tm
-		case deployment.NewTypeAndVersion(Router, deployment.Version1_2_0).String():
-			r, err := router.NewRouter(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.Router = r
-		case deployment.NewTypeAndVersion(PriceRegistry, deployment.Version1_6_0_dev).String():
-			pr, err := price_registry.NewPriceRegistry(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.PriceRegistry = pr
-		case deployment.NewTypeAndVersion(LinkToken, deployment.Version1_0_0).String():
-			lt, err := burn_mint_erc677.NewBurnMintERC677(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.LinkToken = lt
-		case deployment.NewTypeAndVersion(CCIPConfig, deployment.Version1_6_0_dev).String():
-			cc, err := ccip_config.NewCCIPConfig(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.CCIPConfig = cc
-		case deployment.NewTypeAndVersion(CCIPReceiver, deployment.Version1_0_0).String():
-			mr, err := maybe_revert_message_receiver.NewMaybeRevertMessageReceiver(common.HexToAddress(address), chain.Client)
-			if err != nil {
-				return state, err
-			}
-			state.Receiver = mr
-		default:
-			return state, fmt.Errorf("unknown contract %s", tvStr)
-		}
-	}
-	return state, nil
-}
diff --git a/integration-tests/deployment/ccip/test_helpers.go b/integration-tests/deployment/ccip/test_helpers.go
deleted file mode 100644
index 2ec837c9ee..0000000000
--- a/integration-tests/deployment/ccip/test_helpers.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package ccipdeployment
-
-import (
-	"context"
-	"testing"
-
-	chainsel "github.com/smartcontractkit/chain-selectors"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap/zapcore"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/memory"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/logger"
-)
-
-// Context returns a context with the test's deadline, if available.
-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 DeployedTestEnvironment struct {
-	Ab           deployment.AddressBook
-	Env          deployment.Environment
-	HomeChainSel uint64
-	Nodes        map[string]memory.Node
-}
-
-// NewDeployedEnvironment creates a new CCIP environment
-// with capreg and nodes set up.
-func NewDeployedTestEnvironment(t *testing.T, lggr logger.Logger) DeployedTestEnvironment {
-	ctx := Context(t)
-	chains := memory.NewMemoryChains(t, 3)
-	homeChainSel := uint64(0)
-	homeChainEVM := uint64(0)
-	// Say first chain is home chain.
-	for chainSel := range chains {
-		homeChainEVM, _ = chainsel.ChainIdFromSelector(chainSel)
-		homeChainSel = chainSel
-		break
-	}
-	ab, capReg, err := DeployCapReg(lggr, chains, homeChainSel)
-	require.NoError(t, err)
-
-	nodes := memory.NewNodes(t, zapcore.InfoLevel, chains, 4, 1, memory.RegistryConfig{
-		EVMChainID: homeChainEVM,
-		Contract:   capReg,
-	})
-	for _, node := range nodes {
-		require.NoError(t, node.App.Start(ctx))
-		t.Cleanup(func() {
-			require.NoError(t, node.App.Stop())
-		})
-	}
-
-	e := memory.NewMemoryEnvironmentFromChainsNodes(t, lggr, chains, nodes)
-	return DeployedTestEnvironment{
-		Ab:           ab,
-		Env:          e,
-		HomeChainSel: homeChainSel,
-		Nodes:        nodes,
-	}
-}
diff --git a/integration-tests/deployment/changeset.go b/integration-tests/deployment/changeset.go
deleted file mode 100644
index d929022ed9..0000000000
--- a/integration-tests/deployment/changeset.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package deployment
-
-import (
-	owner_wrappers "github.com/smartcontractkit/ccip-owner-contracts/gethwrappers"
-)
-
-// TODO: Move to real MCM structs once available.
-type Proposal struct {
-	// keccak256(abi.encode(root, validUntil)) is what is signed by MCMS
-	// signers.
-	ValidUntil uint32
-	// Leaves are the items in the proposal.
-	// Uses these to generate the root as well as display whats in the root.
-	// These Ops may be destined for distinct chains.
-	Ops []owner_wrappers.ManyChainMultiSigOp
-}
-
-func (p Proposal) String() string {
-	// TODO
-	return ""
-}
-
-// Services as input to CI/Async tasks
-type ChangesetOutput struct {
-	JobSpecs    map[string][]string
-	Proposals   []Proposal
-	AddressBook AddressBook
-}
diff --git a/integration-tests/deployment/environment.go b/integration-tests/deployment/environment.go
deleted file mode 100644
index 7d8fb6e631..0000000000
--- a/integration-tests/deployment/environment.go
+++ /dev/null
@@ -1,195 +0,0 @@
-package deployment
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"math/big"
-	"strconv"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/rpc"
-	chain_selectors "github.com/smartcontractkit/chain-selectors"
-	types2 "github.com/smartcontractkit/libocr/offchainreporting2/types"
-	types3 "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
-	jobv1 "github.com/smartcontractkit/chainlink/integration-tests/deployment/jd/job/v1"
-	nodev1 "github.com/smartcontractkit/chainlink/integration-tests/deployment/jd/node/v1"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/logger"
-)
-
-type OnchainClient interface {
-	// For EVM specifically we can use existing geth interface
-	// to abstract chain clients.
-	bind.ContractBackend
-}
-
-type OffchainClient interface {
-	// The job distributor grpc interface can be used to abstract offchain read/writes
-	jobv1.JobServiceClient
-	nodev1.NodeServiceClient
-}
-
-type Chain struct {
-	// Selectors used as canonical chain identifier.
-	Selector uint64
-	Client   OnchainClient
-	// Note the Sign function can be abstract supporting a variety of key storage mechanisms (e.g. KMS etc).
-	DeployerKey *bind.TransactOpts
-	Confirm     func(tx common.Hash) error
-}
-
-type Environment struct {
-	Name     string
-	Chains   map[uint64]Chain
-	Offchain OffchainClient
-	NodeIDs  []string
-	Logger   logger.Logger
-}
-
-func (e Environment) AllChainSelectors() []uint64 {
-	var selectors []uint64
-	for sel := range e.Chains {
-		selectors = append(selectors, sel)
-	}
-	return selectors
-}
-
-func ConfirmIfNoError(chain Chain, tx *types.Transaction, err error) error {
-	if err != nil {
-		//revive:disable
-		var d rpc.DataError
-		ok := errors.As(err, &d)
-		if ok {
-			return fmt.Errorf("got Data Error: %s", d.ErrorData())
-		}
-		return err
-	}
-	return chain.Confirm(tx.Hash())
-}
-
-func MaybeDataErr(err error) error {
-	//revive:disable
-	var d rpc.DataError
-	ok := errors.As(err, &d)
-	if ok {
-		return d
-	}
-	return err
-}
-
-func UBigInt(i uint64) *big.Int {
-	return new(big.Int).SetUint64(i)
-}
-
-func E18Mult(amount uint64) *big.Int {
-	return new(big.Int).Mul(UBigInt(amount), UBigInt(1e18))
-}
-
-type OCRConfig struct {
-	OffchainPublicKey types2.OffchainPublicKey
-	// For EVM-chains, this an *address*.
-	OnchainPublicKey          types2.OnchainPublicKey
-	PeerID                    p2pkey.PeerID
-	TransmitAccount           types2.Account
-	ConfigEncryptionPublicKey types3.ConfigEncryptionPublicKey
-	IsBootstrap               bool
-	MultiAddr                 string // TODO: type
-}
-
-type Nodes []Node
-
-func (n Nodes) PeerIDs(chainSel uint64) [][32]byte {
-	var peerIDs [][32]byte
-	for _, node := range n {
-		cfg := node.SelToOCRConfig[chainSel]
-		// NOTE: Assume same peerID for all chains.
-		// Might make sense to change proto as peerID is 1-1 with node?
-		peerIDs = append(peerIDs, cfg.PeerID)
-	}
-	return peerIDs
-}
-
-func (n Nodes) BootstrapPeerIDs(chainSel uint64) [][32]byte {
-	var peerIDs [][32]byte
-	for _, node := range n {
-		cfg := node.SelToOCRConfig[chainSel]
-		if !cfg.IsBootstrap {
-			continue
-		}
-		peerIDs = append(peerIDs, cfg.PeerID)
-	}
-	return peerIDs
-}
-
-// OffchainPublicKey types.OffchainPublicKey
-// // For EVM-chains, this an *address*.
-// OnchainPublicKey types.OnchainPublicKey
-// PeerID           string
-// TransmitAccount  types.Account
-type Node struct {
-	SelToOCRConfig map[uint64]OCRConfig
-}
-
-func MustPeerIDFromString(s string) p2pkey.PeerID {
-	p := p2pkey.PeerID{}
-	if err := p.UnmarshalString(s); err != nil {
-		panic(err)
-	}
-	return p
-}
-
-// Gathers all the node info through JD required to be able to set
-// OCR config for example.
-func NodeInfo(nodeIDs []string, oc OffchainClient) (Nodes, error) {
-	var nodes []Node
-	for _, node := range nodeIDs {
-		// TODO: Filter should accept multiple nodes
-		nodeChainConfigs, err := oc.ListNodeChainConfigs(context.Background(), &nodev1.ListNodeChainConfigsRequest{Filter: &nodev1.ListNodeChainConfigsRequest_Filter{
-			NodeId: node,
-		}})
-		if err != nil {
-			return nil, err
-		}
-		selToOCRConfig := make(map[uint64]OCRConfig)
-		for _, chainConfig := range nodeChainConfigs.ChainConfigs {
-			if chainConfig.Chain.Type == nodev1.ChainType_CHAIN_TYPE_SOLANA {
-				// Note supported for CCIP yet.
-				continue
-			}
-			evmChainID, err := strconv.Atoi(chainConfig.Chain.Id)
-			if err != nil {
-				return nil, err
-			}
-			sel, err := chain_selectors.SelectorFromChainId(uint64(evmChainID))
-			if err != nil {
-				return nil, err
-			}
-			b := common.Hex2Bytes(chainConfig.Ocr2Config.OcrKeyBundle.OffchainPublicKey)
-			var opk types2.OffchainPublicKey
-			copy(opk[:], b)
-
-			b = common.Hex2Bytes(chainConfig.Ocr2Config.OcrKeyBundle.ConfigPublicKey)
-			var cpk types3.ConfigEncryptionPublicKey
-			copy(cpk[:], b)
-
-			selToOCRConfig[sel] = OCRConfig{
-				OffchainPublicKey:         opk,
-				OnchainPublicKey:          common.HexToAddress(chainConfig.Ocr2Config.OcrKeyBundle.OnchainSigningAddress).Bytes(),
-				PeerID:                    MustPeerIDFromString(chainConfig.Ocr2Config.P2PKeyBundle.PeerId),
-				TransmitAccount:           types2.Account(chainConfig.AccountAddress),
-				ConfigEncryptionPublicKey: cpk,
-				IsBootstrap:               chainConfig.Ocr2Config.IsBootstrap,
-				MultiAddr:                 chainConfig.Ocr2Config.Multiaddr,
-			}
-		}
-		nodes = append(nodes, Node{
-			SelToOCRConfig: selToOCRConfig,
-		})
-	}
-	return nodes, nil
-}
diff --git a/integration-tests/deployment/jd/job/v1/job.pb.go b/integration-tests/deployment/jd/job/v1/job.pb.go
deleted file mode 100644
index deaf1ccf30..0000000000
--- a/integration-tests/deployment/jd/job/v1/job.pb.go
+++ /dev/null
@@ -1,1767 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.29.0
-// 	protoc        v4.25.3
-// source: job/v1/job.proto
-
-package v1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// ProposalStatus defines the possible states of a job proposal.
-type ProposalStatus int32
-
-const (
-	ProposalStatus_PROPOSAL_STATUS_UNSPECIFIED ProposalStatus = 0
-	ProposalStatus_PROPOSAL_STATUS_PROPOSED    ProposalStatus = 1 // Proposal has been made but not yet decided upon.
-	ProposalStatus_PROPOSAL_STATUS_APPROVED    ProposalStatus = 2 // Proposal has been accepted.
-	ProposalStatus_PROPOSAL_STATUS_REJECTED    ProposalStatus = 3 // Proposal has been rejected.
-	ProposalStatus_PROPOSAL_STATUS_CANCELLED   ProposalStatus = 4 // Proposal has been cancelled.
-	ProposalStatus_PROPOSAL_STATUS_PENDING     ProposalStatus = 5 // Proposal is pending review.
-	ProposalStatus_PROPOSAL_STATUS_REVOKED     ProposalStatus = 6 // Proposal has been revoked after being proposed.
-)
-
-// Enum value maps for ProposalStatus.
-var (
-	ProposalStatus_name = map[int32]string{
-		0: "PROPOSAL_STATUS_UNSPECIFIED",
-		1: "PROPOSAL_STATUS_PROPOSED",
-		2: "PROPOSAL_STATUS_APPROVED",
-		3: "PROPOSAL_STATUS_REJECTED",
-		4: "PROPOSAL_STATUS_CANCELLED",
-		5: "PROPOSAL_STATUS_PENDING",
-		6: "PROPOSAL_STATUS_REVOKED",
-	}
-	ProposalStatus_value = map[string]int32{
-		"PROPOSAL_STATUS_UNSPECIFIED": 0,
-		"PROPOSAL_STATUS_PROPOSED":    1,
-		"PROPOSAL_STATUS_APPROVED":    2,
-		"PROPOSAL_STATUS_REJECTED":    3,
-		"PROPOSAL_STATUS_CANCELLED":   4,
-		"PROPOSAL_STATUS_PENDING":     5,
-		"PROPOSAL_STATUS_REVOKED":     6,
-	}
-)
-
-func (x ProposalStatus) Enum() *ProposalStatus {
-	p := new(ProposalStatus)
-	*p = x
-	return p
-}
-
-func (x ProposalStatus) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ProposalStatus) Descriptor() protoreflect.EnumDescriptor {
-	return file_job_v1_job_proto_enumTypes[0].Descriptor()
-}
-
-func (ProposalStatus) Type() protoreflect.EnumType {
-	return &file_job_v1_job_proto_enumTypes[0]
-}
-
-func (x ProposalStatus) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ProposalStatus.Descriptor instead.
-func (ProposalStatus) EnumDescriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{0}
-}
-
-// ProposalDeliveryStatus defines the delivery status of the proposal to the node.
-type ProposalDeliveryStatus int32
-
-const (
-	ProposalDeliveryStatus_PROPOSAL_DELIVERY_STATUS_UNSPECIFIED  ProposalDeliveryStatus = 0
-	ProposalDeliveryStatus_PROPOSAL_DELIVERY_STATUS_DELIVERED    ProposalDeliveryStatus = 1 // Delivered to the node.
-	ProposalDeliveryStatus_PROPOSAL_DELIVERY_STATUS_ACKNOWLEDGED ProposalDeliveryStatus = 2 // Acknowledged by the node.
-	ProposalDeliveryStatus_PROPOSAL_DELIVERY_STATUS_FAILED       ProposalDeliveryStatus = 3 // Delivery failed.
-)
-
-// Enum value maps for ProposalDeliveryStatus.
-var (
-	ProposalDeliveryStatus_name = map[int32]string{
-		0: "PROPOSAL_DELIVERY_STATUS_UNSPECIFIED",
-		1: "PROPOSAL_DELIVERY_STATUS_DELIVERED",
-		2: "PROPOSAL_DELIVERY_STATUS_ACKNOWLEDGED",
-		3: "PROPOSAL_DELIVERY_STATUS_FAILED",
-	}
-	ProposalDeliveryStatus_value = map[string]int32{
-		"PROPOSAL_DELIVERY_STATUS_UNSPECIFIED":  0,
-		"PROPOSAL_DELIVERY_STATUS_DELIVERED":    1,
-		"PROPOSAL_DELIVERY_STATUS_ACKNOWLEDGED": 2,
-		"PROPOSAL_DELIVERY_STATUS_FAILED":       3,
-	}
-)
-
-func (x ProposalDeliveryStatus) Enum() *ProposalDeliveryStatus {
-	p := new(ProposalDeliveryStatus)
-	*p = x
-	return p
-}
-
-func (x ProposalDeliveryStatus) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ProposalDeliveryStatus) Descriptor() protoreflect.EnumDescriptor {
-	return file_job_v1_job_proto_enumTypes[1].Descriptor()
-}
-
-func (ProposalDeliveryStatus) Type() protoreflect.EnumType {
-	return &file_job_v1_job_proto_enumTypes[1]
-}
-
-func (x ProposalDeliveryStatus) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ProposalDeliveryStatus.Descriptor instead.
-func (ProposalDeliveryStatus) EnumDescriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{1}
-}
-
-// Job represents the structured data of a job within the system.
-type Job struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id          string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`                                      // Unique identifier for the job.
-	Uuid        string                 `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`                                  // Universally unique identifier for the job.
-	NodeId      string                 `protobuf:"bytes,3,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"`                // ID of the node associated with this job.
-	ProposalIds []string               `protobuf:"bytes,4,rep,name=proposal_ids,json=proposalIds,proto3" json:"proposal_ids,omitempty"` // List of proposal IDs associated with this job.
-	CreatedAt   *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`       // Timestamp when the job was created.
-	UpdatedAt   *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`       // Timestamp when the job was last updated.
-	DeletedAt   *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=deleted_at,json=deletedAt,proto3" json:"deleted_at,omitempty"`       // Timestamp when the job was deleted, if applicable.
-}
-
-func (x *Job) Reset() {
-	*x = Job{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Job) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Job) ProtoMessage() {}
-
-func (x *Job) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Job.ProtoReflect.Descriptor instead.
-func (*Job) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Job) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *Job) GetUuid() string {
-	if x != nil {
-		return x.Uuid
-	}
-	return ""
-}
-
-func (x *Job) GetNodeId() string {
-	if x != nil {
-		return x.NodeId
-	}
-	return ""
-}
-
-func (x *Job) GetProposalIds() []string {
-	if x != nil {
-		return x.ProposalIds
-	}
-	return nil
-}
-
-func (x *Job) GetCreatedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.CreatedAt
-	}
-	return nil
-}
-
-func (x *Job) GetUpdatedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.UpdatedAt
-	}
-	return nil
-}
-
-func (x *Job) GetDeletedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.DeletedAt
-	}
-	return nil
-}
-
-// Proposal represents a job proposal.
-type Proposal struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id                 string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`                                                                                       // Unique identifier for the proposal.
-	Version            int64                  `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"`                                                                            // Version number of the proposal.
-	Status             ProposalStatus         `protobuf:"varint,3,opt,name=status,proto3,enum=api.job.v1.ProposalStatus" json:"status,omitempty"`                                               // Current status of the proposal.
-	DeliveryStatus     ProposalDeliveryStatus `protobuf:"varint,4,opt,name=delivery_status,json=deliveryStatus,proto3,enum=api.job.v1.ProposalDeliveryStatus" json:"delivery_status,omitempty"` // Delivery status of the proposal.
-	Spec               string                 `protobuf:"bytes,5,opt,name=spec,proto3" json:"spec,omitempty"`                                                                                   // Specification of the job proposed.
-	JobId              string                 `protobuf:"bytes,6,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`                                                                    // ID of the job associated with this proposal.
-	CreatedAt          *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`                                                        // Timestamp when the proposal was created.
-	UpdatedAt          *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`                                                        // Timestamp when the proposal was last updated.
-	AckedAt            *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=acked_at,json=ackedAt,proto3,oneof" json:"acked_at,omitempty"`                                                        // Timestamp when the proposal was acknowledged.
-	ResponseReceivedAt *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=response_received_at,json=responseReceivedAt,proto3,oneof" json:"response_received_at,omitempty"`                    // Timestamp when a response was received.
-}
-
-func (x *Proposal) Reset() {
-	*x = Proposal{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Proposal) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Proposal) ProtoMessage() {}
-
-func (x *Proposal) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Proposal.ProtoReflect.Descriptor instead.
-func (*Proposal) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Proposal) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *Proposal) GetVersion() int64 {
-	if x != nil {
-		return x.Version
-	}
-	return 0
-}
-
-func (x *Proposal) GetStatus() ProposalStatus {
-	if x != nil {
-		return x.Status
-	}
-	return ProposalStatus_PROPOSAL_STATUS_UNSPECIFIED
-}
-
-func (x *Proposal) GetDeliveryStatus() ProposalDeliveryStatus {
-	if x != nil {
-		return x.DeliveryStatus
-	}
-	return ProposalDeliveryStatus_PROPOSAL_DELIVERY_STATUS_UNSPECIFIED
-}
-
-func (x *Proposal) GetSpec() string {
-	if x != nil {
-		return x.Spec
-	}
-	return ""
-}
-
-func (x *Proposal) GetJobId() string {
-	if x != nil {
-		return x.JobId
-	}
-	return ""
-}
-
-func (x *Proposal) GetCreatedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.CreatedAt
-	}
-	return nil
-}
-
-func (x *Proposal) GetUpdatedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.UpdatedAt
-	}
-	return nil
-}
-
-func (x *Proposal) GetAckedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.AckedAt
-	}
-	return nil
-}
-
-func (x *Proposal) GetResponseReceivedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.ResponseReceivedAt
-	}
-	return nil
-}
-
-// GetJobRequest specifies the criteria for retrieving a job.
-type GetJobRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to IdOneof:
-	//
-	//	*GetJobRequest_Id
-	//	*GetJobRequest_Uuid
-	IdOneof isGetJobRequest_IdOneof `protobuf_oneof:"id_oneof"`
-}
-
-func (x *GetJobRequest) Reset() {
-	*x = GetJobRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetJobRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetJobRequest) ProtoMessage() {}
-
-func (x *GetJobRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetJobRequest.ProtoReflect.Descriptor instead.
-func (*GetJobRequest) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{2}
-}
-
-func (m *GetJobRequest) GetIdOneof() isGetJobRequest_IdOneof {
-	if m != nil {
-		return m.IdOneof
-	}
-	return nil
-}
-
-func (x *GetJobRequest) GetId() string {
-	if x, ok := x.GetIdOneof().(*GetJobRequest_Id); ok {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *GetJobRequest) GetUuid() string {
-	if x, ok := x.GetIdOneof().(*GetJobRequest_Uuid); ok {
-		return x.Uuid
-	}
-	return ""
-}
-
-type isGetJobRequest_IdOneof interface {
-	isGetJobRequest_IdOneof()
-}
-
-type GetJobRequest_Id struct {
-	Id string `protobuf:"bytes,1,opt,name=id,proto3,oneof"` // Unique identifier of the job.
-}
-
-type GetJobRequest_Uuid struct {
-	Uuid string `protobuf:"bytes,2,opt,name=uuid,proto3,oneof"` // Universally unique identifier of the job.
-}
-
-func (*GetJobRequest_Id) isGetJobRequest_IdOneof() {}
-
-func (*GetJobRequest_Uuid) isGetJobRequest_IdOneof() {}
-
-// GetJobResponse contains the job details.
-type GetJobResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Job *Job `protobuf:"bytes,1,opt,name=job,proto3" json:"job,omitempty"` // Details of the retrieved job.
-}
-
-func (x *GetJobResponse) Reset() {
-	*x = GetJobResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetJobResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetJobResponse) ProtoMessage() {}
-
-func (x *GetJobResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetJobResponse.ProtoReflect.Descriptor instead.
-func (*GetJobResponse) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *GetJobResponse) GetJob() *Job {
-	if x != nil {
-		return x.Job
-	}
-	return nil
-}
-
-// GetProposalRequest specifies the criteria for retrieving a proposal.
-type GetProposalRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // Unique identifier of the proposal to retrieve.
-}
-
-func (x *GetProposalRequest) Reset() {
-	*x = GetProposalRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetProposalRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetProposalRequest) ProtoMessage() {}
-
-func (x *GetProposalRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetProposalRequest.ProtoReflect.Descriptor instead.
-func (*GetProposalRequest) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *GetProposalRequest) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-// GetProposalResponse contains the proposal details.
-type GetProposalResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Proposal *Proposal `protobuf:"bytes,1,opt,name=proposal,proto3" json:"proposal,omitempty"` // Details of the retrieved proposal.
-}
-
-func (x *GetProposalResponse) Reset() {
-	*x = GetProposalResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetProposalResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetProposalResponse) ProtoMessage() {}
-
-func (x *GetProposalResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetProposalResponse.ProtoReflect.Descriptor instead.
-func (*GetProposalResponse) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *GetProposalResponse) GetProposal() *Proposal {
-	if x != nil {
-		return x.Proposal
-	}
-	return nil
-}
-
-// ListJobsRequest specifies filters for listing jobs.
-type ListJobsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Filter *ListJobsRequest_Filter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` // Filters applied to the job listing.
-}
-
-func (x *ListJobsRequest) Reset() {
-	*x = ListJobsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListJobsRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListJobsRequest) ProtoMessage() {}
-
-func (x *ListJobsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListJobsRequest.ProtoReflect.Descriptor instead.
-func (*ListJobsRequest) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *ListJobsRequest) GetFilter() *ListJobsRequest_Filter {
-	if x != nil {
-		return x.Filter
-	}
-	return nil
-}
-
-// ListJobsResponse contains a list of jobs that match the filters.
-type ListJobsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Jobs []*Job `protobuf:"bytes,1,rep,name=jobs,proto3" json:"jobs,omitempty"` // List of jobs.
-}
-
-func (x *ListJobsResponse) Reset() {
-	*x = ListJobsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListJobsResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListJobsResponse) ProtoMessage() {}
-
-func (x *ListJobsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListJobsResponse.ProtoReflect.Descriptor instead.
-func (*ListJobsResponse) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *ListJobsResponse) GetJobs() []*Job {
-	if x != nil {
-		return x.Jobs
-	}
-	return nil
-}
-
-// ListProposalsRequest specifies filters for listing proposals.
-type ListProposalsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Filter *ListProposalsRequest_Filter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` // Filters applied to the proposal listing.
-}
-
-func (x *ListProposalsRequest) Reset() {
-	*x = ListProposalsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListProposalsRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListProposalsRequest) ProtoMessage() {}
-
-func (x *ListProposalsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListProposalsRequest.ProtoReflect.Descriptor instead.
-func (*ListProposalsRequest) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *ListProposalsRequest) GetFilter() *ListProposalsRequest_Filter {
-	if x != nil {
-		return x.Filter
-	}
-	return nil
-}
-
-// ListProposalsResponse contains a list of proposals that match the filters.
-type ListProposalsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Proposals []*Proposal `protobuf:"bytes,1,rep,name=proposals,proto3" json:"proposals,omitempty"` // List of proposals.
-}
-
-func (x *ListProposalsResponse) Reset() {
-	*x = ListProposalsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListProposalsResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListProposalsResponse) ProtoMessage() {}
-
-func (x *ListProposalsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListProposalsResponse.ProtoReflect.Descriptor instead.
-func (*ListProposalsResponse) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *ListProposalsResponse) GetProposals() []*Proposal {
-	if x != nil {
-		return x.Proposals
-	}
-	return nil
-}
-
-// ProposeJobRequest contains the information needed to submit a new job proposal.
-type ProposeJobRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	NodeId string `protobuf:"bytes,1,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"` // ID of the node to which the job is proposed.
-	Spec   string `protobuf:"bytes,2,opt,name=spec,proto3" json:"spec,omitempty"`                   // Specification of the job being proposed.
-}
-
-func (x *ProposeJobRequest) Reset() {
-	*x = ProposeJobRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ProposeJobRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ProposeJobRequest) ProtoMessage() {}
-
-func (x *ProposeJobRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ProposeJobRequest.ProtoReflect.Descriptor instead.
-func (*ProposeJobRequest) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *ProposeJobRequest) GetNodeId() string {
-	if x != nil {
-		return x.NodeId
-	}
-	return ""
-}
-
-func (x *ProposeJobRequest) GetSpec() string {
-	if x != nil {
-		return x.Spec
-	}
-	return ""
-}
-
-// ProposeJobResponse returns the newly created proposal.
-type ProposeJobResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Proposal *Proposal `protobuf:"bytes,1,opt,name=proposal,proto3" json:"proposal,omitempty"` // Details of the newly created proposal.
-}
-
-func (x *ProposeJobResponse) Reset() {
-	*x = ProposeJobResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ProposeJobResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ProposeJobResponse) ProtoMessage() {}
-
-func (x *ProposeJobResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ProposeJobResponse.ProtoReflect.Descriptor instead.
-func (*ProposeJobResponse) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *ProposeJobResponse) GetProposal() *Proposal {
-	if x != nil {
-		return x.Proposal
-	}
-	return nil
-}
-
-// RevokeJobRequest specifies the criteria for revoking a job proposal.
-type RevokeJobRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to IdOneof:
-	//
-	//	*RevokeJobRequest_Id
-	//	*RevokeJobRequest_Uuid
-	IdOneof isRevokeJobRequest_IdOneof `protobuf_oneof:"id_oneof"`
-}
-
-func (x *RevokeJobRequest) Reset() {
-	*x = RevokeJobRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RevokeJobRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RevokeJobRequest) ProtoMessage() {}
-
-func (x *RevokeJobRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RevokeJobRequest.ProtoReflect.Descriptor instead.
-func (*RevokeJobRequest) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{12}
-}
-
-func (m *RevokeJobRequest) GetIdOneof() isRevokeJobRequest_IdOneof {
-	if m != nil {
-		return m.IdOneof
-	}
-	return nil
-}
-
-func (x *RevokeJobRequest) GetId() string {
-	if x, ok := x.GetIdOneof().(*RevokeJobRequest_Id); ok {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *RevokeJobRequest) GetUuid() string {
-	if x, ok := x.GetIdOneof().(*RevokeJobRequest_Uuid); ok {
-		return x.Uuid
-	}
-	return ""
-}
-
-type isRevokeJobRequest_IdOneof interface {
-	isRevokeJobRequest_IdOneof()
-}
-
-type RevokeJobRequest_Id struct {
-	Id string `protobuf:"bytes,1,opt,name=id,proto3,oneof"` // Unique identifier of the proposal to revoke.
-}
-
-type RevokeJobRequest_Uuid struct {
-	Uuid string `protobuf:"bytes,2,opt,name=uuid,proto3,oneof"` // Universally unique identifier of the proposal to revoke.
-}
-
-func (*RevokeJobRequest_Id) isRevokeJobRequest_IdOneof() {}
-
-func (*RevokeJobRequest_Uuid) isRevokeJobRequest_IdOneof() {}
-
-// RevokeJobResponse returns the revoked proposal.
-type RevokeJobResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Proposal *Proposal `protobuf:"bytes,1,opt,name=proposal,proto3" json:"proposal,omitempty"` // Details of the revoked proposal.
-}
-
-func (x *RevokeJobResponse) Reset() {
-	*x = RevokeJobResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RevokeJobResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RevokeJobResponse) ProtoMessage() {}
-
-func (x *RevokeJobResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RevokeJobResponse.ProtoReflect.Descriptor instead.
-func (*RevokeJobResponse) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *RevokeJobResponse) GetProposal() *Proposal {
-	if x != nil {
-		return x.Proposal
-	}
-	return nil
-}
-
-// DeleteJobRequest specifies the criteria for deleting a job.
-type DeleteJobRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to IdOneof:
-	//
-	//	*DeleteJobRequest_Id
-	//	*DeleteJobRequest_Uuid
-	IdOneof isDeleteJobRequest_IdOneof `protobuf_oneof:"id_oneof"`
-}
-
-func (x *DeleteJobRequest) Reset() {
-	*x = DeleteJobRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DeleteJobRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DeleteJobRequest) ProtoMessage() {}
-
-func (x *DeleteJobRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DeleteJobRequest.ProtoReflect.Descriptor instead.
-func (*DeleteJobRequest) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{14}
-}
-
-func (m *DeleteJobRequest) GetIdOneof() isDeleteJobRequest_IdOneof {
-	if m != nil {
-		return m.IdOneof
-	}
-	return nil
-}
-
-func (x *DeleteJobRequest) GetId() string {
-	if x, ok := x.GetIdOneof().(*DeleteJobRequest_Id); ok {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *DeleteJobRequest) GetUuid() string {
-	if x, ok := x.GetIdOneof().(*DeleteJobRequest_Uuid); ok {
-		return x.Uuid
-	}
-	return ""
-}
-
-type isDeleteJobRequest_IdOneof interface {
-	isDeleteJobRequest_IdOneof()
-}
-
-type DeleteJobRequest_Id struct {
-	Id string `protobuf:"bytes,1,opt,name=id,proto3,oneof"` // Unique identifier of the job to delete.
-}
-
-type DeleteJobRequest_Uuid struct {
-	Uuid string `protobuf:"bytes,2,opt,name=uuid,proto3,oneof"` // Universally unique identifier of the job to delete.
-}
-
-func (*DeleteJobRequest_Id) isDeleteJobRequest_IdOneof() {}
-
-func (*DeleteJobRequest_Uuid) isDeleteJobRequest_IdOneof() {}
-
-// DeleteJobResponse returns details of the deleted job.
-type DeleteJobResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Job *Job `protobuf:"bytes,1,opt,name=job,proto3" json:"job,omitempty"` // Details of the deleted job.
-}
-
-func (x *DeleteJobResponse) Reset() {
-	*x = DeleteJobResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DeleteJobResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DeleteJobResponse) ProtoMessage() {}
-
-func (x *DeleteJobResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DeleteJobResponse.ProtoReflect.Descriptor instead.
-func (*DeleteJobResponse) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *DeleteJobResponse) GetJob() *Job {
-	if x != nil {
-		return x.Job
-	}
-	return nil
-}
-
-type ListJobsRequest_Filter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Ids     []string `protobuf:"bytes,1,rep,name=ids,proto3" json:"ids,omitempty"`                        // Filter by job IDs.
-	NodeIds []string `protobuf:"bytes,2,rep,name=node_ids,json=nodeIds,proto3" json:"node_ids,omitempty"` // Filter by node IDs.
-}
-
-func (x *ListJobsRequest_Filter) Reset() {
-	*x = ListJobsRequest_Filter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListJobsRequest_Filter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListJobsRequest_Filter) ProtoMessage() {}
-
-func (x *ListJobsRequest_Filter) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListJobsRequest_Filter.ProtoReflect.Descriptor instead.
-func (*ListJobsRequest_Filter) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{6, 0}
-}
-
-func (x *ListJobsRequest_Filter) GetIds() []string {
-	if x != nil {
-		return x.Ids
-	}
-	return nil
-}
-
-func (x *ListJobsRequest_Filter) GetNodeIds() []string {
-	if x != nil {
-		return x.NodeIds
-	}
-	return nil
-}
-
-type ListProposalsRequest_Filter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Ids    []string `protobuf:"bytes,1,rep,name=ids,proto3" json:"ids,omitempty"`                     // Filter by proposal IDs.
-	JobIds []string `protobuf:"bytes,2,rep,name=job_ids,json=jobIds,proto3" json:"job_ids,omitempty"` // Filter by job IDs.
-}
-
-func (x *ListProposalsRequest_Filter) Reset() {
-	*x = ListProposalsRequest_Filter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_job_v1_job_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListProposalsRequest_Filter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListProposalsRequest_Filter) ProtoMessage() {}
-
-func (x *ListProposalsRequest_Filter) ProtoReflect() protoreflect.Message {
-	mi := &file_job_v1_job_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListProposalsRequest_Filter.ProtoReflect.Descriptor instead.
-func (*ListProposalsRequest_Filter) Descriptor() ([]byte, []int) {
-	return file_job_v1_job_proto_rawDescGZIP(), []int{8, 0}
-}
-
-func (x *ListProposalsRequest_Filter) GetIds() []string {
-	if x != nil {
-		return x.Ids
-	}
-	return nil
-}
-
-func (x *ListProposalsRequest_Filter) GetJobIds() []string {
-	if x != nil {
-		return x.JobIds
-	}
-	return nil
-}
-
-var File_job_v1_job_proto protoreflect.FileDescriptor
-
-var file_job_v1_job_proto_rawDesc = []byte{
-	0x0a, 0x10, 0x6a, 0x6f, 0x62, 0x2f, 0x76, 0x31, 0x2f, 0x6a, 0x6f, 0x62, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x0a, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x1a, 0x1f,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
-	0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0x96, 0x02, 0x0a, 0x03, 0x4a, 0x6f, 0x62, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x6e,
-	0x6f, 0x64, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f,
-	0x64, 0x65, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c,
-	0x5f, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x72, 0x6f, 0x70,
-	0x6f, 0x73, 0x61, 0x6c, 0x49, 0x64, 0x73, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69,
-	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x41, 0x74, 0x12, 0x39, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x6d, 0x70, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x39, 0x0a,
-	0x0a, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x64,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x22, 0x8b, 0x04, 0x0a, 0x08, 0x50, 0x72, 0x6f,
-	0x70, 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12,
-	0x32, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f,
-	0x70, 0x6f, 0x73, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x12, 0x4b, 0x0a, 0x0f, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x5f,
-	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x22, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73,
-	0x61, 0x6c, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x52, 0x0e, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x12, 0x12, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x73, 0x70, 0x65, 0x63, 0x12, 0x15, 0x0a, 0x06, 0x6a, 0x6f, 0x62, 0x5f, 0x69, 0x64, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6a, 0x6f, 0x62, 0x49, 0x64, 0x12, 0x39, 0x0a, 0x0a, 0x63,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x39, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x64, 0x5f, 0x61, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41,
-	0x74, 0x12, 0x3a, 0x0a, 0x08, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x09, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x48,
-	0x00, 0x52, 0x07, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x41, 0x74, 0x88, 0x01, 0x01, 0x12, 0x51, 0x0a,
-	0x14, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76,
-	0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69,
-	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x48, 0x01, 0x52, 0x12, 0x72, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x41, 0x74, 0x88, 0x01, 0x01,
-	0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x42, 0x17, 0x0a,
-	0x15, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x72, 0x65, 0x63, 0x65, 0x69,
-	0x76, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x22, 0x43, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x62,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x04, 0x75, 0x75, 0x69,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x42,
-	0x0a, 0x0a, 0x08, 0x69, 0x64, 0x5f, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x22, 0x33, 0x0a, 0x0e, 0x47,
-	0x65, 0x74, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a,
-	0x03, 0x6a, 0x6f, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62,
-	0x22, 0x24, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x47, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x50, 0x72, 0x6f,
-	0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a,
-	0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x14, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f,
-	0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x22,
-	0x84, 0x01, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x3a, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x1a,
-	0x35, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x6e,
-	0x6f, 0x64, 0x65, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x6e,
-	0x6f, 0x64, 0x65, 0x49, 0x64, 0x73, 0x22, 0x37, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x4a, 0x6f,
-	0x62, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x04, 0x6a, 0x6f,
-	0x62, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a,
-	0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x62, 0x52, 0x04, 0x6a, 0x6f, 0x62, 0x73, 0x22,
-	0x8c, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a,
-	0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73,
-	0x61, 0x6c, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x1a, 0x33, 0x0a, 0x06, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x03, 0x69, 0x64, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x6a, 0x6f, 0x62, 0x5f, 0x69, 0x64, 0x73,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6a, 0x6f, 0x62, 0x49, 0x64, 0x73, 0x22, 0x4b,
-	0x0a, 0x15, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x70, 0x6f,
-	0x73, 0x61, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c,
-	0x52, 0x09, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x73, 0x22, 0x40, 0x0a, 0x11, 0x50,
-	0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x17, 0x0a, 0x07, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x70, 0x65,
-	0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x22, 0x46, 0x0a,
-	0x12, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e,
-	0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f,
-	0x70, 0x6f, 0x73, 0x61, 0x6c, 0x22, 0x46, 0x0a, 0x10, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4a,
-	0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x04, 0x75,
-	0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x75, 0x75, 0x69,
-	0x64, 0x42, 0x0a, 0x0a, 0x08, 0x69, 0x64, 0x5f, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x22, 0x45, 0x0a,
-	0x11, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x30, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76,
-	0x31, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70,
-	0x6f, 0x73, 0x61, 0x6c, 0x22, 0x46, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f,
-	0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x04, 0x75, 0x75,
-	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64,
-	0x42, 0x0a, 0x0a, 0x08, 0x69, 0x64, 0x5f, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x22, 0x36, 0x0a, 0x11,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x21, 0x0a, 0x03, 0x6a, 0x6f, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x62, 0x52,
-	0x03, 0x6a, 0x6f, 0x62, 0x2a, 0xe4, 0x01, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61,
-	0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1f, 0x0a, 0x1b, 0x50, 0x52, 0x4f, 0x50, 0x4f,
-	0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
-	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x50, 0x52, 0x4f, 0x50,
-	0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x52, 0x4f, 0x50,
-	0x4f, 0x53, 0x45, 0x44, 0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53,
-	0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x41, 0x50, 0x50, 0x52, 0x4f, 0x56,
-	0x45, 0x44, 0x10, 0x02, 0x12, 0x1c, 0x0a, 0x18, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c,
-	0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x45, 0x44,
-	0x10, 0x03, 0x12, 0x1d, 0x0a, 0x19, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53,
-	0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x45, 0x44, 0x10,
-	0x04, 0x12, 0x1b, 0x0a, 0x17, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54,
-	0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x05, 0x12, 0x1b,
-	0x0a, 0x17, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55,
-	0x53, 0x5f, 0x52, 0x45, 0x56, 0x4f, 0x4b, 0x45, 0x44, 0x10, 0x06, 0x2a, 0xba, 0x01, 0x0a, 0x16,
-	0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x28, 0x0a, 0x24, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53,
-	0x41, 0x4c, 0x5f, 0x44, 0x45, 0x4c, 0x49, 0x56, 0x45, 0x52, 0x59, 0x5f, 0x53, 0x54, 0x41, 0x54,
-	0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
-	0x12, 0x26, 0x0a, 0x22, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x44, 0x45, 0x4c,
-	0x49, 0x56, 0x45, 0x52, 0x59, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x44, 0x45, 0x4c,
-	0x49, 0x56, 0x45, 0x52, 0x45, 0x44, 0x10, 0x01, 0x12, 0x29, 0x0a, 0x25, 0x50, 0x52, 0x4f, 0x50,
-	0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x44, 0x45, 0x4c, 0x49, 0x56, 0x45, 0x52, 0x59, 0x5f, 0x53, 0x54,
-	0x41, 0x54, 0x55, 0x53, 0x5f, 0x41, 0x43, 0x4b, 0x4e, 0x4f, 0x57, 0x4c, 0x45, 0x44, 0x47, 0x45,
-	0x44, 0x10, 0x02, 0x12, 0x23, 0x0a, 0x1f, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f,
-	0x44, 0x45, 0x4c, 0x49, 0x56, 0x45, 0x52, 0x59, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f,
-	0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x03, 0x32, 0xa9, 0x04, 0x0a, 0x0a, 0x4a, 0x6f, 0x62,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x41, 0x0a, 0x06, 0x47, 0x65, 0x74, 0x4a, 0x6f,
-	0x62, 0x12, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x74, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x62,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0b, 0x47, 0x65,
-	0x74, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73,
-	0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73,
-	0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x47, 0x0a, 0x08,
-	0x4c, 0x69, 0x73, 0x74, 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x1b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a,
-	0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e,
-	0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x56, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x72, 0x6f,
-	0x70, 0x6f, 0x73, 0x61, 0x6c, 0x73, 0x12, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62,
-	0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a,
-	0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73,
-	0x61, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a,
-	0x0a, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x1d, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65,
-	0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x4a,
-	0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x09,
-	0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4a, 0x6f, 0x62,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f,
-	0x62, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65,
-	0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e,
-	0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6a, 0x6f, 0x62, 0x2e, 0x76, 0x31,
-	0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x42, 0x08, 0x5a, 0x06, 0x6a, 0x6f, 0x62, 0x2f, 0x76, 0x31, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_job_v1_job_proto_rawDescOnce sync.Once
-	file_job_v1_job_proto_rawDescData = file_job_v1_job_proto_rawDesc
-)
-
-func file_job_v1_job_proto_rawDescGZIP() []byte {
-	file_job_v1_job_proto_rawDescOnce.Do(func() {
-		file_job_v1_job_proto_rawDescData = protoimpl.X.CompressGZIP(file_job_v1_job_proto_rawDescData)
-	})
-	return file_job_v1_job_proto_rawDescData
-}
-
-var file_job_v1_job_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_job_v1_job_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
-var file_job_v1_job_proto_goTypes = []interface{}{
-	(ProposalStatus)(0),                 // 0: api.job.v1.ProposalStatus
-	(ProposalDeliveryStatus)(0),         // 1: api.job.v1.ProposalDeliveryStatus
-	(*Job)(nil),                         // 2: api.job.v1.Job
-	(*Proposal)(nil),                    // 3: api.job.v1.Proposal
-	(*GetJobRequest)(nil),               // 4: api.job.v1.GetJobRequest
-	(*GetJobResponse)(nil),              // 5: api.job.v1.GetJobResponse
-	(*GetProposalRequest)(nil),          // 6: api.job.v1.GetProposalRequest
-	(*GetProposalResponse)(nil),         // 7: api.job.v1.GetProposalResponse
-	(*ListJobsRequest)(nil),             // 8: api.job.v1.ListJobsRequest
-	(*ListJobsResponse)(nil),            // 9: api.job.v1.ListJobsResponse
-	(*ListProposalsRequest)(nil),        // 10: api.job.v1.ListProposalsRequest
-	(*ListProposalsResponse)(nil),       // 11: api.job.v1.ListProposalsResponse
-	(*ProposeJobRequest)(nil),           // 12: api.job.v1.ProposeJobRequest
-	(*ProposeJobResponse)(nil),          // 13: api.job.v1.ProposeJobResponse
-	(*RevokeJobRequest)(nil),            // 14: api.job.v1.RevokeJobRequest
-	(*RevokeJobResponse)(nil),           // 15: api.job.v1.RevokeJobResponse
-	(*DeleteJobRequest)(nil),            // 16: api.job.v1.DeleteJobRequest
-	(*DeleteJobResponse)(nil),           // 17: api.job.v1.DeleteJobResponse
-	(*ListJobsRequest_Filter)(nil),      // 18: api.job.v1.ListJobsRequest.Filter
-	(*ListProposalsRequest_Filter)(nil), // 19: api.job.v1.ListProposalsRequest.Filter
-	(*timestamppb.Timestamp)(nil),       // 20: google.protobuf.Timestamp
-}
-var file_job_v1_job_proto_depIdxs = []int32{
-	20, // 0: api.job.v1.Job.created_at:type_name -> google.protobuf.Timestamp
-	20, // 1: api.job.v1.Job.updated_at:type_name -> google.protobuf.Timestamp
-	20, // 2: api.job.v1.Job.deleted_at:type_name -> google.protobuf.Timestamp
-	0,  // 3: api.job.v1.Proposal.status:type_name -> api.job.v1.ProposalStatus
-	1,  // 4: api.job.v1.Proposal.delivery_status:type_name -> api.job.v1.ProposalDeliveryStatus
-	20, // 5: api.job.v1.Proposal.created_at:type_name -> google.protobuf.Timestamp
-	20, // 6: api.job.v1.Proposal.updated_at:type_name -> google.protobuf.Timestamp
-	20, // 7: api.job.v1.Proposal.acked_at:type_name -> google.protobuf.Timestamp
-	20, // 8: api.job.v1.Proposal.response_received_at:type_name -> google.protobuf.Timestamp
-	2,  // 9: api.job.v1.GetJobResponse.job:type_name -> api.job.v1.Job
-	3,  // 10: api.job.v1.GetProposalResponse.proposal:type_name -> api.job.v1.Proposal
-	18, // 11: api.job.v1.ListJobsRequest.filter:type_name -> api.job.v1.ListJobsRequest.Filter
-	2,  // 12: api.job.v1.ListJobsResponse.jobs:type_name -> api.job.v1.Job
-	19, // 13: api.job.v1.ListProposalsRequest.filter:type_name -> api.job.v1.ListProposalsRequest.Filter
-	3,  // 14: api.job.v1.ListProposalsResponse.proposals:type_name -> api.job.v1.Proposal
-	3,  // 15: api.job.v1.ProposeJobResponse.proposal:type_name -> api.job.v1.Proposal
-	3,  // 16: api.job.v1.RevokeJobResponse.proposal:type_name -> api.job.v1.Proposal
-	2,  // 17: api.job.v1.DeleteJobResponse.job:type_name -> api.job.v1.Job
-	4,  // 18: api.job.v1.JobService.GetJob:input_type -> api.job.v1.GetJobRequest
-	6,  // 19: api.job.v1.JobService.GetProposal:input_type -> api.job.v1.GetProposalRequest
-	8,  // 20: api.job.v1.JobService.ListJobs:input_type -> api.job.v1.ListJobsRequest
-	10, // 21: api.job.v1.JobService.ListProposals:input_type -> api.job.v1.ListProposalsRequest
-	12, // 22: api.job.v1.JobService.ProposeJob:input_type -> api.job.v1.ProposeJobRequest
-	14, // 23: api.job.v1.JobService.RevokeJob:input_type -> api.job.v1.RevokeJobRequest
-	16, // 24: api.job.v1.JobService.DeleteJob:input_type -> api.job.v1.DeleteJobRequest
-	5,  // 25: api.job.v1.JobService.GetJob:output_type -> api.job.v1.GetJobResponse
-	7,  // 26: api.job.v1.JobService.GetProposal:output_type -> api.job.v1.GetProposalResponse
-	9,  // 27: api.job.v1.JobService.ListJobs:output_type -> api.job.v1.ListJobsResponse
-	11, // 28: api.job.v1.JobService.ListProposals:output_type -> api.job.v1.ListProposalsResponse
-	13, // 29: api.job.v1.JobService.ProposeJob:output_type -> api.job.v1.ProposeJobResponse
-	15, // 30: api.job.v1.JobService.RevokeJob:output_type -> api.job.v1.RevokeJobResponse
-	17, // 31: api.job.v1.JobService.DeleteJob:output_type -> api.job.v1.DeleteJobResponse
-	25, // [25:32] is the sub-list for method output_type
-	18, // [18:25] is the sub-list for method input_type
-	18, // [18:18] is the sub-list for extension type_name
-	18, // [18:18] is the sub-list for extension extendee
-	0,  // [0:18] is the sub-list for field type_name
-}
-
-func init() { file_job_v1_job_proto_init() }
-func file_job_v1_job_proto_init() {
-	if File_job_v1_job_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_job_v1_job_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Job); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Proposal); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetJobRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetJobResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetProposalRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetProposalResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListJobsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListJobsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListProposalsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListProposalsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ProposeJobRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ProposeJobResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RevokeJobRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RevokeJobResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteJobRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteJobResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListJobsRequest_Filter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_job_v1_job_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListProposalsRequest_Filter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_job_v1_job_proto_msgTypes[1].OneofWrappers = []interface{}{}
-	file_job_v1_job_proto_msgTypes[2].OneofWrappers = []interface{}{
-		(*GetJobRequest_Id)(nil),
-		(*GetJobRequest_Uuid)(nil),
-	}
-	file_job_v1_job_proto_msgTypes[12].OneofWrappers = []interface{}{
-		(*RevokeJobRequest_Id)(nil),
-		(*RevokeJobRequest_Uuid)(nil),
-	}
-	file_job_v1_job_proto_msgTypes[14].OneofWrappers = []interface{}{
-		(*DeleteJobRequest_Id)(nil),
-		(*DeleteJobRequest_Uuid)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_job_v1_job_proto_rawDesc,
-			NumEnums:      2,
-			NumMessages:   18,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_job_v1_job_proto_goTypes,
-		DependencyIndexes: file_job_v1_job_proto_depIdxs,
-		EnumInfos:         file_job_v1_job_proto_enumTypes,
-		MessageInfos:      file_job_v1_job_proto_msgTypes,
-	}.Build()
-	File_job_v1_job_proto = out.File
-	file_job_v1_job_proto_rawDesc = nil
-	file_job_v1_job_proto_goTypes = nil
-	file_job_v1_job_proto_depIdxs = nil
-}
diff --git a/integration-tests/deployment/jd/job/v1/job_grpc.pb.go b/integration-tests/deployment/jd/job/v1/job_grpc.pb.go
deleted file mode 100644
index 9b9207c020..0000000000
--- a/integration-tests/deployment/jd/job/v1/job_grpc.pb.go
+++ /dev/null
@@ -1,345 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.3.0
-// - protoc             v4.25.3
-// source: job/v1/job.proto
-
-package v1
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-const (
-	JobService_GetJob_FullMethodName        = "/api.job.v1.JobService/GetJob"
-	JobService_GetProposal_FullMethodName   = "/api.job.v1.JobService/GetProposal"
-	JobService_ListJobs_FullMethodName      = "/api.job.v1.JobService/ListJobs"
-	JobService_ListProposals_FullMethodName = "/api.job.v1.JobService/ListProposals"
-	JobService_ProposeJob_FullMethodName    = "/api.job.v1.JobService/ProposeJob"
-	JobService_RevokeJob_FullMethodName     = "/api.job.v1.JobService/RevokeJob"
-	JobService_DeleteJob_FullMethodName     = "/api.job.v1.JobService/DeleteJob"
-)
-
-// JobServiceClient is the client API for JobService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type JobServiceClient interface {
-	// GetJob retrieves the details of a specific job by its ID or UUID.
-	GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*GetJobResponse, error)
-	// GetProposal retrieves the details of a specific proposal by its ID.
-	GetProposal(ctx context.Context, in *GetProposalRequest, opts ...grpc.CallOption) (*GetProposalResponse, error)
-	// ListJobs returns a list of jobs, optionally filtered by IDs or node IDs.
-	ListJobs(ctx context.Context, in *ListJobsRequest, opts ...grpc.CallOption) (*ListJobsResponse, error)
-	// ListProposals returns a list of proposals, optionally filtered by proposal or job IDs.
-	ListProposals(ctx context.Context, in *ListProposalsRequest, opts ...grpc.CallOption) (*ListProposalsResponse, error)
-	// ProposeJob submits a new job proposal to a node.
-	ProposeJob(ctx context.Context, in *ProposeJobRequest, opts ...grpc.CallOption) (*ProposeJobResponse, error)
-	// RevokeJob revokes an existing job proposal.
-	RevokeJob(ctx context.Context, in *RevokeJobRequest, opts ...grpc.CallOption) (*RevokeJobResponse, error)
-	// DeleteJob deletes a job from the system.
-	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*DeleteJobResponse, error)
-}
-
-type jobServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewJobServiceClient(cc grpc.ClientConnInterface) JobServiceClient {
-	return &jobServiceClient{cc}
-}
-
-func (c *jobServiceClient) GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*GetJobResponse, error) {
-	out := new(GetJobResponse)
-	err := c.cc.Invoke(ctx, JobService_GetJob_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *jobServiceClient) GetProposal(ctx context.Context, in *GetProposalRequest, opts ...grpc.CallOption) (*GetProposalResponse, error) {
-	out := new(GetProposalResponse)
-	err := c.cc.Invoke(ctx, JobService_GetProposal_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *jobServiceClient) ListJobs(ctx context.Context, in *ListJobsRequest, opts ...grpc.CallOption) (*ListJobsResponse, error) {
-	out := new(ListJobsResponse)
-	err := c.cc.Invoke(ctx, JobService_ListJobs_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *jobServiceClient) ListProposals(ctx context.Context, in *ListProposalsRequest, opts ...grpc.CallOption) (*ListProposalsResponse, error) {
-	out := new(ListProposalsResponse)
-	err := c.cc.Invoke(ctx, JobService_ListProposals_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *jobServiceClient) ProposeJob(ctx context.Context, in *ProposeJobRequest, opts ...grpc.CallOption) (*ProposeJobResponse, error) {
-	out := new(ProposeJobResponse)
-	err := c.cc.Invoke(ctx, JobService_ProposeJob_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *jobServiceClient) RevokeJob(ctx context.Context, in *RevokeJobRequest, opts ...grpc.CallOption) (*RevokeJobResponse, error) {
-	out := new(RevokeJobResponse)
-	err := c.cc.Invoke(ctx, JobService_RevokeJob_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *jobServiceClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*DeleteJobResponse, error) {
-	out := new(DeleteJobResponse)
-	err := c.cc.Invoke(ctx, JobService_DeleteJob_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// JobServiceServer is the server API for JobService service.
-// All implementations must embed UnimplementedJobServiceServer
-// for forward compatibility
-type JobServiceServer interface {
-	// GetJob retrieves the details of a specific job by its ID or UUID.
-	GetJob(context.Context, *GetJobRequest) (*GetJobResponse, error)
-	// GetProposal retrieves the details of a specific proposal by its ID.
-	GetProposal(context.Context, *GetProposalRequest) (*GetProposalResponse, error)
-	// ListJobs returns a list of jobs, optionally filtered by IDs or node IDs.
-	ListJobs(context.Context, *ListJobsRequest) (*ListJobsResponse, error)
-	// ListProposals returns a list of proposals, optionally filtered by proposal or job IDs.
-	ListProposals(context.Context, *ListProposalsRequest) (*ListProposalsResponse, error)
-	// ProposeJob submits a new job proposal to a node.
-	ProposeJob(context.Context, *ProposeJobRequest) (*ProposeJobResponse, error)
-	// RevokeJob revokes an existing job proposal.
-	RevokeJob(context.Context, *RevokeJobRequest) (*RevokeJobResponse, error)
-	// DeleteJob deletes a job from the system.
-	DeleteJob(context.Context, *DeleteJobRequest) (*DeleteJobResponse, error)
-	mustEmbedUnimplementedJobServiceServer()
-}
-
-// UnimplementedJobServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedJobServiceServer struct {
-}
-
-func (UnimplementedJobServiceServer) GetJob(context.Context, *GetJobRequest) (*GetJobResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetJob not implemented")
-}
-func (UnimplementedJobServiceServer) GetProposal(context.Context, *GetProposalRequest) (*GetProposalResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetProposal not implemented")
-}
-func (UnimplementedJobServiceServer) ListJobs(context.Context, *ListJobsRequest) (*ListJobsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ListJobs not implemented")
-}
-func (UnimplementedJobServiceServer) ListProposals(context.Context, *ListProposalsRequest) (*ListProposalsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ListProposals not implemented")
-}
-func (UnimplementedJobServiceServer) ProposeJob(context.Context, *ProposeJobRequest) (*ProposeJobResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ProposeJob not implemented")
-}
-func (UnimplementedJobServiceServer) RevokeJob(context.Context, *RevokeJobRequest) (*RevokeJobResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RevokeJob not implemented")
-}
-func (UnimplementedJobServiceServer) DeleteJob(context.Context, *DeleteJobRequest) (*DeleteJobResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DeleteJob not implemented")
-}
-func (UnimplementedJobServiceServer) mustEmbedUnimplementedJobServiceServer() {}
-
-// UnsafeJobServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to JobServiceServer will
-// result in compilation errors.
-type UnsafeJobServiceServer interface {
-	mustEmbedUnimplementedJobServiceServer()
-}
-
-func RegisterJobServiceServer(s grpc.ServiceRegistrar, srv JobServiceServer) {
-	s.RegisterService(&JobService_ServiceDesc, srv)
-}
-
-func _JobService_GetJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).GetJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: JobService_GetJob_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).GetJob(ctx, req.(*GetJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _JobService_GetProposal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetProposalRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).GetProposal(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: JobService_GetProposal_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).GetProposal(ctx, req.(*GetProposalRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _JobService_ListJobs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListJobsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).ListJobs(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: JobService_ListJobs_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).ListJobs(ctx, req.(*ListJobsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _JobService_ListProposals_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListProposalsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).ListProposals(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: JobService_ListProposals_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).ListProposals(ctx, req.(*ListProposalsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _JobService_ProposeJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProposeJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).ProposeJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: JobService_ProposeJob_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).ProposeJob(ctx, req.(*ProposeJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _JobService_RevokeJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RevokeJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).RevokeJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: JobService_RevokeJob_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).RevokeJob(ctx, req.(*RevokeJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _JobService_DeleteJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).DeleteJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: JobService_DeleteJob_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).DeleteJob(ctx, req.(*DeleteJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// JobService_ServiceDesc is the grpc.ServiceDesc for JobService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var JobService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "api.job.v1.JobService",
-	HandlerType: (*JobServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "GetJob",
-			Handler:    _JobService_GetJob_Handler,
-		},
-		{
-			MethodName: "GetProposal",
-			Handler:    _JobService_GetProposal_Handler,
-		},
-		{
-			MethodName: "ListJobs",
-			Handler:    _JobService_ListJobs_Handler,
-		},
-		{
-			MethodName: "ListProposals",
-			Handler:    _JobService_ListProposals_Handler,
-		},
-		{
-			MethodName: "ProposeJob",
-			Handler:    _JobService_ProposeJob_Handler,
-		},
-		{
-			MethodName: "RevokeJob",
-			Handler:    _JobService_RevokeJob_Handler,
-		},
-		{
-			MethodName: "DeleteJob",
-			Handler:    _JobService_DeleteJob_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "job/v1/job.proto",
-}
diff --git a/integration-tests/deployment/jd/node/v1/node.pb.go b/integration-tests/deployment/jd/node/v1/node.pb.go
deleted file mode 100644
index f5b22ba3ae..0000000000
--- a/integration-tests/deployment/jd/node/v1/node.pb.go
+++ /dev/null
@@ -1,1652 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.29.0
-// 	protoc        v4.25.3
-// source: node/v1/node.proto
-
-package v1
-
-import (
-	"reflect"
-	"sync"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-	_ "google.golang.org/protobuf/types/known/timestamppb"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/jd/shared/ptypes"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type ChainType int32
-
-const (
-	ChainType_CHAIN_TYPE_UNSPECIFIED ChainType = 0
-	ChainType_CHAIN_TYPE_EVM         ChainType = 1
-	ChainType_CHAIN_TYPE_SOLANA      ChainType = 2
-)
-
-// Enum value maps for ChainType.
-var (
-	ChainType_name = map[int32]string{
-		0: "CHAIN_TYPE_UNSPECIFIED",
-		1: "CHAIN_TYPE_EVM",
-		2: "CHAIN_TYPE_SOLANA",
-	}
-	ChainType_value = map[string]int32{
-		"CHAIN_TYPE_UNSPECIFIED": 0,
-		"CHAIN_TYPE_EVM":         1,
-		"CHAIN_TYPE_SOLANA":      2,
-	}
-)
-
-func (x ChainType) Enum() *ChainType {
-	p := new(ChainType)
-	*p = x
-	return p
-}
-
-func (x ChainType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ChainType) Descriptor() protoreflect.EnumDescriptor {
-	return file_node_v1_node_proto_enumTypes[0].Descriptor()
-}
-
-func (ChainType) Type() protoreflect.EnumType {
-	return &file_node_v1_node_proto_enumTypes[0]
-}
-
-func (x ChainType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ChainType.Descriptor instead.
-func (ChainType) EnumDescriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{0}
-}
-
-// ArchiveState represents the archived state of the node.
-type ArchiveState int32
-
-const (
-	ArchiveState_ARCHIVE_STATE_UNSPECIFIED ArchiveState = 0
-	ArchiveState_ARCHIVE_STATE_ARCHIVED    ArchiveState = 1
-	ArchiveState_ARCHIVE_STATE_ACTIVE      ArchiveState = 2
-)
-
-// Enum value maps for ArchiveState.
-var (
-	ArchiveState_name = map[int32]string{
-		0: "ARCHIVE_STATE_UNSPECIFIED",
-		1: "ARCHIVE_STATE_ARCHIVED",
-		2: "ARCHIVE_STATE_ACTIVE",
-	}
-	ArchiveState_value = map[string]int32{
-		"ARCHIVE_STATE_UNSPECIFIED": 0,
-		"ARCHIVE_STATE_ARCHIVED":    1,
-		"ARCHIVE_STATE_ACTIVE":      2,
-	}
-)
-
-func (x ArchiveState) Enum() *ArchiveState {
-	p := new(ArchiveState)
-	*p = x
-	return p
-}
-
-func (x ArchiveState) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ArchiveState) Descriptor() protoreflect.EnumDescriptor {
-	return file_node_v1_node_proto_enumTypes[1].Descriptor()
-}
-
-func (ArchiveState) Type() protoreflect.EnumType {
-	return &file_node_v1_node_proto_enumTypes[1]
-}
-
-func (x ArchiveState) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ArchiveState.Descriptor instead.
-func (ArchiveState) EnumDescriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{1}
-}
-
-type Chain struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id   string    `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Type ChainType `protobuf:"varint,2,opt,name=type,proto3,enum=api.node.v1.ChainType" json:"type,omitempty"`
-}
-
-func (x *Chain) Reset() {
-	*x = Chain{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Chain) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Chain) ProtoMessage() {}
-
-func (x *Chain) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Chain.ProtoReflect.Descriptor instead.
-func (*Chain) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Chain) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *Chain) GetType() ChainType {
-	if x != nil {
-		return x.Type
-	}
-	return ChainType_CHAIN_TYPE_UNSPECIFIED
-}
-
-type OCR1Config struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Enabled      bool                     `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
-	IsBootstrap  bool                     `protobuf:"varint,2,opt,name=is_bootstrap,json=isBootstrap,proto3" json:"is_bootstrap,omitempty"`
-	P2PKeyBundle *OCR1Config_P2PKeyBundle `protobuf:"bytes,3,opt,name=p2p_key_bundle,json=p2pKeyBundle,proto3" json:"p2p_key_bundle,omitempty"`
-	OcrKeyBundle *OCR1Config_OCRKeyBundle `protobuf:"bytes,4,opt,name=ocr_key_bundle,json=ocrKeyBundle,proto3" json:"ocr_key_bundle,omitempty"`
-	Multiaddr    string                   `protobuf:"bytes,5,opt,name=multiaddr,proto3" json:"multiaddr,omitempty"`
-}
-
-func (x *OCR1Config) Reset() {
-	*x = OCR1Config{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OCR1Config) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OCR1Config) ProtoMessage() {}
-
-func (x *OCR1Config) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OCR1Config.ProtoReflect.Descriptor instead.
-func (*OCR1Config) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *OCR1Config) GetEnabled() bool {
-	if x != nil {
-		return x.Enabled
-	}
-	return false
-}
-
-func (x *OCR1Config) GetIsBootstrap() bool {
-	if x != nil {
-		return x.IsBootstrap
-	}
-	return false
-}
-
-func (x *OCR1Config) GetP2PKeyBundle() *OCR1Config_P2PKeyBundle {
-	if x != nil {
-		return x.P2PKeyBundle
-	}
-	return nil
-}
-
-func (x *OCR1Config) GetOcrKeyBundle() *OCR1Config_OCRKeyBundle {
-	if x != nil {
-		return x.OcrKeyBundle
-	}
-	return nil
-}
-
-func (x *OCR1Config) GetMultiaddr() string {
-	if x != nil {
-		return x.Multiaddr
-	}
-	return ""
-}
-
-type OCR2Config struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Enabled          bool                     `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
-	IsBootstrap      bool                     `protobuf:"varint,2,opt,name=is_bootstrap,json=isBootstrap,proto3" json:"is_bootstrap,omitempty"`
-	P2PKeyBundle     *OCR2Config_P2PKeyBundle `protobuf:"bytes,3,opt,name=p2p_key_bundle,json=p2pKeyBundle,proto3" json:"p2p_key_bundle,omitempty"`
-	OcrKeyBundle     *OCR2Config_OCRKeyBundle `protobuf:"bytes,4,opt,name=ocr_key_bundle,json=ocrKeyBundle,proto3" json:"ocr_key_bundle,omitempty"`
-	Multiaddr        string                   `protobuf:"bytes,5,opt,name=multiaddr,proto3" json:"multiaddr,omitempty"`
-	Plugins          *OCR2Config_Plugins      `protobuf:"bytes,6,opt,name=plugins,proto3" json:"plugins,omitempty"`
-	ForwarderAddress string                   `protobuf:"bytes,7,opt,name=forwarder_address,json=forwarderAddress,proto3" json:"forwarder_address,omitempty"`
-}
-
-func (x *OCR2Config) Reset() {
-	*x = OCR2Config{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OCR2Config) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OCR2Config) ProtoMessage() {}
-
-func (x *OCR2Config) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OCR2Config.ProtoReflect.Descriptor instead.
-func (*OCR2Config) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *OCR2Config) GetEnabled() bool {
-	if x != nil {
-		return x.Enabled
-	}
-	return false
-}
-
-func (x *OCR2Config) GetIsBootstrap() bool {
-	if x != nil {
-		return x.IsBootstrap
-	}
-	return false
-}
-
-func (x *OCR2Config) GetP2PKeyBundle() *OCR2Config_P2PKeyBundle {
-	if x != nil {
-		return x.P2PKeyBundle
-	}
-	return nil
-}
-
-func (x *OCR2Config) GetOcrKeyBundle() *OCR2Config_OCRKeyBundle {
-	if x != nil {
-		return x.OcrKeyBundle
-	}
-	return nil
-}
-
-func (x *OCR2Config) GetMultiaddr() string {
-	if x != nil {
-		return x.Multiaddr
-	}
-	return ""
-}
-
-func (x *OCR2Config) GetPlugins() *OCR2Config_Plugins {
-	if x != nil {
-		return x.Plugins
-	}
-	return nil
-}
-
-func (x *OCR2Config) GetForwarderAddress() string {
-	if x != nil {
-		return x.ForwarderAddress
-	}
-	return ""
-}
-
-type ChainConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Chain          *Chain      `protobuf:"bytes,1,opt,name=chain,proto3" json:"chain,omitempty"`
-	AccountAddress string      `protobuf:"bytes,2,opt,name=account_address,json=accountAddress,proto3" json:"account_address,omitempty"`
-	AdminAddress   string      `protobuf:"bytes,3,opt,name=admin_address,json=adminAddress,proto3" json:"admin_address,omitempty"`
-	Ocr1Config     *OCR1Config `protobuf:"bytes,4,opt,name=ocr1_config,json=ocr1Config,proto3" json:"ocr1_config,omitempty"`
-	Ocr2Config     *OCR2Config `protobuf:"bytes,5,opt,name=ocr2_config,json=ocr2Config,proto3" json:"ocr2_config,omitempty"`
-}
-
-func (x *ChainConfig) Reset() {
-	*x = ChainConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ChainConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ChainConfig) ProtoMessage() {}
-
-func (x *ChainConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ChainConfig.ProtoReflect.Descriptor instead.
-func (*ChainConfig) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *ChainConfig) GetChain() *Chain {
-	if x != nil {
-		return x.Chain
-	}
-	return nil
-}
-
-func (x *ChainConfig) GetAccountAddress() string {
-	if x != nil {
-		return x.AccountAddress
-	}
-	return ""
-}
-
-func (x *ChainConfig) GetAdminAddress() string {
-	if x != nil {
-		return x.AdminAddress
-	}
-	return ""
-}
-
-func (x *ChainConfig) GetOcr1Config() *OCR1Config {
-	if x != nil {
-		return x.Ocr1Config
-	}
-	return nil
-}
-
-func (x *ChainConfig) GetOcr2Config() *OCR2Config {
-	if x != nil {
-		return x.Ocr2Config
-	}
-	return nil
-}
-
-// GetNodeRequest is the request to retrieve a single node by its ID.
-type GetNodeRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // Unique identifier of the node to retrieve.
-}
-
-func (x *GetNodeRequest) Reset() {
-	*x = GetNodeRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetNodeRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetNodeRequest) ProtoMessage() {}
-
-func (x *GetNodeRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetNodeRequest.ProtoReflect.Descriptor instead.
-func (*GetNodeRequest) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *GetNodeRequest) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-// GetNodeResponse is the response containing the requested node.
-type GetNodeResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Node *Node `protobuf:"bytes,1,opt,name=node,proto3" json:"node,omitempty"` // Details of the retrieved node.
-}
-
-func (x *GetNodeResponse) Reset() {
-	*x = GetNodeResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetNodeResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetNodeResponse) ProtoMessage() {}
-
-func (x *GetNodeResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetNodeResponse.ProtoReflect.Descriptor instead.
-func (*GetNodeResponse) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *GetNodeResponse) GetNode() *Node {
-	if x != nil {
-		return x.Node
-	}
-	return nil
-}
-
-// *
-// ListNodesRequest is the request object for the ListNodes method.
-//
-// Provide a filter to return a subset of data. Nodes can be filtered by:
-//   - ids - A list of node ids.
-//   - archived - The archived state of the node.
-//   - selectors - A list of selectors to filter nodes by their labels.
-//
-// If no filter is provided, all nodes are returned.
-type ListNodesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Filter *ListNodesRequest_Filter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
-}
-
-func (x *ListNodesRequest) Reset() {
-	*x = ListNodesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListNodesRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListNodesRequest) ProtoMessage() {}
-
-func (x *ListNodesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListNodesRequest.ProtoReflect.Descriptor instead.
-func (*ListNodesRequest) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *ListNodesRequest) GetFilter() *ListNodesRequest_Filter {
-	if x != nil {
-		return x.Filter
-	}
-	return nil
-}
-
-// *
-// ListNodesResponse is the response object for the ListNodes method.
-//
-// It returns a list of nodes that match the filter criteria.
-type ListNodesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Nodes []*Node `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"` // List of nodes.
-}
-
-func (x *ListNodesResponse) Reset() {
-	*x = ListNodesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListNodesResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListNodesResponse) ProtoMessage() {}
-
-func (x *ListNodesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListNodesResponse.ProtoReflect.Descriptor instead.
-func (*ListNodesResponse) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *ListNodesResponse) GetNodes() []*Node {
-	if x != nil {
-		return x.Nodes
-	}
-	return nil
-}
-
-type ListNodeChainConfigsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Filter *ListNodeChainConfigsRequest_Filter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
-}
-
-func (x *ListNodeChainConfigsRequest) Reset() {
-	*x = ListNodeChainConfigsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListNodeChainConfigsRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListNodeChainConfigsRequest) ProtoMessage() {}
-
-func (x *ListNodeChainConfigsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListNodeChainConfigsRequest.ProtoReflect.Descriptor instead.
-func (*ListNodeChainConfigsRequest) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *ListNodeChainConfigsRequest) GetFilter() *ListNodeChainConfigsRequest_Filter {
-	if x != nil {
-		return x.Filter
-	}
-	return nil
-}
-
-type ListNodeChainConfigsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ChainConfigs []*ChainConfig `protobuf:"bytes,1,rep,name=chain_configs,json=chainConfigs,proto3" json:"chain_configs,omitempty"`
-}
-
-func (x *ListNodeChainConfigsResponse) Reset() {
-	*x = ListNodeChainConfigsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListNodeChainConfigsResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListNodeChainConfigsResponse) ProtoMessage() {}
-
-func (x *ListNodeChainConfigsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListNodeChainConfigsResponse.ProtoReflect.Descriptor instead.
-func (*ListNodeChainConfigsResponse) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *ListNodeChainConfigsResponse) GetChainConfigs() []*ChainConfig {
-	if x != nil {
-		return x.ChainConfigs
-	}
-	return nil
-}
-
-type OCR1Config_P2PKeyBundle struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PeerId    string `protobuf:"bytes,1,opt,name=peer_id,json=peerId,proto3" json:"peer_id,omitempty"`
-	PublicKey string `protobuf:"bytes,2,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"`
-}
-
-func (x *OCR1Config_P2PKeyBundle) Reset() {
-	*x = OCR1Config_P2PKeyBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OCR1Config_P2PKeyBundle) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OCR1Config_P2PKeyBundle) ProtoMessage() {}
-
-func (x *OCR1Config_P2PKeyBundle) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OCR1Config_P2PKeyBundle.ProtoReflect.Descriptor instead.
-func (*OCR1Config_P2PKeyBundle) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{1, 0}
-}
-
-func (x *OCR1Config_P2PKeyBundle) GetPeerId() string {
-	if x != nil {
-		return x.PeerId
-	}
-	return ""
-}
-
-func (x *OCR1Config_P2PKeyBundle) GetPublicKey() string {
-	if x != nil {
-		return x.PublicKey
-	}
-	return ""
-}
-
-type OCR1Config_OCRKeyBundle struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BundleId              string `protobuf:"bytes,1,opt,name=bundle_id,json=bundleId,proto3" json:"bundle_id,omitempty"`
-	ConfigPublicKey       string `protobuf:"bytes,2,opt,name=config_public_key,json=configPublicKey,proto3" json:"config_public_key,omitempty"`
-	OffchainPublicKey     string `protobuf:"bytes,3,opt,name=offchain_public_key,json=offchainPublicKey,proto3" json:"offchain_public_key,omitempty"`
-	OnchainSigningAddress string `protobuf:"bytes,4,opt,name=onchain_signing_address,json=onchainSigningAddress,proto3" json:"onchain_signing_address,omitempty"`
-}
-
-func (x *OCR1Config_OCRKeyBundle) Reset() {
-	*x = OCR1Config_OCRKeyBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OCR1Config_OCRKeyBundle) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OCR1Config_OCRKeyBundle) ProtoMessage() {}
-
-func (x *OCR1Config_OCRKeyBundle) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OCR1Config_OCRKeyBundle.ProtoReflect.Descriptor instead.
-func (*OCR1Config_OCRKeyBundle) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{1, 1}
-}
-
-func (x *OCR1Config_OCRKeyBundle) GetBundleId() string {
-	if x != nil {
-		return x.BundleId
-	}
-	return ""
-}
-
-func (x *OCR1Config_OCRKeyBundle) GetConfigPublicKey() string {
-	if x != nil {
-		return x.ConfigPublicKey
-	}
-	return ""
-}
-
-func (x *OCR1Config_OCRKeyBundle) GetOffchainPublicKey() string {
-	if x != nil {
-		return x.OffchainPublicKey
-	}
-	return ""
-}
-
-func (x *OCR1Config_OCRKeyBundle) GetOnchainSigningAddress() string {
-	if x != nil {
-		return x.OnchainSigningAddress
-	}
-	return ""
-}
-
-type OCR2Config_P2PKeyBundle struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PeerId    string `protobuf:"bytes,1,opt,name=peer_id,json=peerId,proto3" json:"peer_id,omitempty"`
-	PublicKey string `protobuf:"bytes,2,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"`
-}
-
-func (x *OCR2Config_P2PKeyBundle) Reset() {
-	*x = OCR2Config_P2PKeyBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OCR2Config_P2PKeyBundle) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OCR2Config_P2PKeyBundle) ProtoMessage() {}
-
-func (x *OCR2Config_P2PKeyBundle) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OCR2Config_P2PKeyBundle.ProtoReflect.Descriptor instead.
-func (*OCR2Config_P2PKeyBundle) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{2, 0}
-}
-
-func (x *OCR2Config_P2PKeyBundle) GetPeerId() string {
-	if x != nil {
-		return x.PeerId
-	}
-	return ""
-}
-
-func (x *OCR2Config_P2PKeyBundle) GetPublicKey() string {
-	if x != nil {
-		return x.PublicKey
-	}
-	return ""
-}
-
-type OCR2Config_OCRKeyBundle struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BundleId              string `protobuf:"bytes,1,opt,name=bundle_id,json=bundleId,proto3" json:"bundle_id,omitempty"`
-	ConfigPublicKey       string `protobuf:"bytes,2,opt,name=config_public_key,json=configPublicKey,proto3" json:"config_public_key,omitempty"`
-	OffchainPublicKey     string `protobuf:"bytes,3,opt,name=offchain_public_key,json=offchainPublicKey,proto3" json:"offchain_public_key,omitempty"`
-	OnchainSigningAddress string `protobuf:"bytes,4,opt,name=onchain_signing_address,json=onchainSigningAddress,proto3" json:"onchain_signing_address,omitempty"`
-}
-
-func (x *OCR2Config_OCRKeyBundle) Reset() {
-	*x = OCR2Config_OCRKeyBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OCR2Config_OCRKeyBundle) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OCR2Config_OCRKeyBundle) ProtoMessage() {}
-
-func (x *OCR2Config_OCRKeyBundle) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OCR2Config_OCRKeyBundle.ProtoReflect.Descriptor instead.
-func (*OCR2Config_OCRKeyBundle) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{2, 1}
-}
-
-func (x *OCR2Config_OCRKeyBundle) GetBundleId() string {
-	if x != nil {
-		return x.BundleId
-	}
-	return ""
-}
-
-func (x *OCR2Config_OCRKeyBundle) GetConfigPublicKey() string {
-	if x != nil {
-		return x.ConfigPublicKey
-	}
-	return ""
-}
-
-func (x *OCR2Config_OCRKeyBundle) GetOffchainPublicKey() string {
-	if x != nil {
-		return x.OffchainPublicKey
-	}
-	return ""
-}
-
-func (x *OCR2Config_OCRKeyBundle) GetOnchainSigningAddress() string {
-	if x != nil {
-		return x.OnchainSigningAddress
-	}
-	return ""
-}
-
-type OCR2Config_Plugins struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Commit     bool `protobuf:"varint,1,opt,name=commit,proto3" json:"commit,omitempty"`
-	Execute    bool `protobuf:"varint,2,opt,name=execute,proto3" json:"execute,omitempty"`
-	Median     bool `protobuf:"varint,3,opt,name=median,proto3" json:"median,omitempty"`
-	Mercury    bool `protobuf:"varint,4,opt,name=mercury,proto3" json:"mercury,omitempty"`
-	Rebalancer bool `protobuf:"varint,5,opt,name=rebalancer,proto3" json:"rebalancer,omitempty"`
-}
-
-func (x *OCR2Config_Plugins) Reset() {
-	*x = OCR2Config_Plugins{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OCR2Config_Plugins) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OCR2Config_Plugins) ProtoMessage() {}
-
-func (x *OCR2Config_Plugins) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OCR2Config_Plugins.ProtoReflect.Descriptor instead.
-func (*OCR2Config_Plugins) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{2, 2}
-}
-
-func (x *OCR2Config_Plugins) GetCommit() bool {
-	if x != nil {
-		return x.Commit
-	}
-	return false
-}
-
-func (x *OCR2Config_Plugins) GetExecute() bool {
-	if x != nil {
-		return x.Execute
-	}
-	return false
-}
-
-func (x *OCR2Config_Plugins) GetMedian() bool {
-	if x != nil {
-		return x.Median
-	}
-	return false
-}
-
-func (x *OCR2Config_Plugins) GetMercury() bool {
-	if x != nil {
-		return x.Mercury
-	}
-	return false
-}
-
-func (x *OCR2Config_Plugins) GetRebalancer() bool {
-	if x != nil {
-		return x.Rebalancer
-	}
-	return false
-}
-
-type ListNodesRequest_Filter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Ids       []string           `protobuf:"bytes,1,rep,name=ids,proto3" json:"ids,omitempty"`
-	Archived  ArchiveState       `protobuf:"varint,2,opt,name=archived,proto3,enum=api.node.v1.ArchiveState" json:"archived,omitempty"`
-	Selectors []*ptypes.Selector `protobuf:"bytes,3,rep,name=selectors,proto3" json:"selectors,omitempty"`
-}
-
-func (x *ListNodesRequest_Filter) Reset() {
-	*x = ListNodesRequest_Filter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListNodesRequest_Filter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListNodesRequest_Filter) ProtoMessage() {}
-
-func (x *ListNodesRequest_Filter) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListNodesRequest_Filter.ProtoReflect.Descriptor instead.
-func (*ListNodesRequest_Filter) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{6, 0}
-}
-
-func (x *ListNodesRequest_Filter) GetIds() []string {
-	if x != nil {
-		return x.Ids
-	}
-	return nil
-}
-
-func (x *ListNodesRequest_Filter) GetArchived() ArchiveState {
-	if x != nil {
-		return x.Archived
-	}
-	return ArchiveState_ARCHIVE_STATE_UNSPECIFIED
-}
-
-func (x *ListNodesRequest_Filter) GetSelectors() []*ptypes.Selector {
-	if x != nil {
-		return x.Selectors
-	}
-	return nil
-}
-
-type ListNodeChainConfigsRequest_Filter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	NodeId string `protobuf:"bytes,1,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"`
-}
-
-func (x *ListNodeChainConfigsRequest_Filter) Reset() {
-	*x = ListNodeChainConfigsRequest_Filter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_node_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListNodeChainConfigsRequest_Filter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListNodeChainConfigsRequest_Filter) ProtoMessage() {}
-
-func (x *ListNodeChainConfigsRequest_Filter) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_node_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListNodeChainConfigsRequest_Filter.ProtoReflect.Descriptor instead.
-func (*ListNodeChainConfigsRequest_Filter) Descriptor() ([]byte, []int) {
-	return file_node_v1_node_proto_rawDescGZIP(), []int{8, 0}
-}
-
-func (x *ListNodeChainConfigsRequest_Filter) GetNodeId() string {
-	if x != nil {
-		return x.NodeId
-	}
-	return ""
-}
-
-var File_node_v1_node_proto protoreflect.FileDescriptor
-
-var file_node_v1_node_proto_rawDesc = []byte{
-	0x0a, 0x12, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0b, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x76,
-	0x31, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x14, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x68, 0x61, 0x72,
-	0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64,
-	0x2f, 0x70, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0x43, 0x0a, 0x05, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x04,
-	0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x54, 0x79,
-	0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x89, 0x04, 0x0a, 0x0a, 0x4f, 0x43, 0x52,
-	0x31, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c,
-	0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
-	0x64, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
-	0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73,
-	0x74, 0x72, 0x61, 0x70, 0x12, 0x4a, 0x0a, 0x0e, 0x70, 0x32, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x5f,
-	0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x43, 0x52, 0x31, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x50, 0x32, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x6e, 0x64,
-	0x6c, 0x65, 0x52, 0x0c, 0x70, 0x32, 0x70, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65,
-	0x12, 0x4a, 0x0a, 0x0e, 0x6f, 0x63, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x62, 0x75, 0x6e, 0x64,
-	0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e,
-	0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x43, 0x52, 0x31, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x4f, 0x43, 0x52, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x0c,
-	0x6f, 0x63, 0x72, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09,
-	0x6d, 0x75, 0x6c, 0x74, 0x69, 0x61, 0x64, 0x64, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x61, 0x64, 0x64, 0x72, 0x1a, 0x46, 0x0a, 0x0c, 0x50, 0x32,
-	0x50, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x70, 0x65,
-	0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x65, 0x65,
-	0x72, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65,
-	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b,
-	0x65, 0x79, 0x1a, 0xbf, 0x01, 0x0a, 0x0c, 0x4f, 0x43, 0x52, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x6e,
-	0x64, 0x6c, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x49, 0x64,
-	0x12, 0x2a, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69,
-	0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x2e, 0x0a, 0x13,
-	0x6f, 0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f,
-	0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x6f, 0x66, 0x66, 0x63, 0x68,
-	0x61, 0x69, 0x6e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x36, 0x0a, 0x17,
-	0x6f, 0x6e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x5f,
-	0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x6f,
-	0x6e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x22, 0x81, 0x06, 0x0a, 0x0a, 0x4f, 0x43, 0x52, 0x32, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x21, 0x0a,
-	0x0c, 0x69, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70,
-	0x12, 0x4a, 0x0a, 0x0e, 0x70, 0x32, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x62, 0x75, 0x6e, 0x64,
-	0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e,
-	0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x43, 0x52, 0x32, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x50, 0x32, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x0c,
-	0x70, 0x32, 0x70, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x4a, 0x0a, 0x0e,
-	0x6f, 0x63, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x4f, 0x43, 0x52, 0x32, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4f, 0x43,
-	0x52, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x0c, 0x6f, 0x63, 0x72, 0x4b,
-	0x65, 0x79, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x75, 0x6c, 0x74,
-	0x69, 0x61, 0x64, 0x64, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x75, 0x6c,
-	0x74, 0x69, 0x61, 0x64, 0x64, 0x72, 0x12, 0x39, 0x0a, 0x07, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e,
-	0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f,
-	0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x43, 0x52, 0x32, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x52, 0x07, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e,
-	0x73, 0x12, 0x2b, 0x0a, 0x11, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x61,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x66, 0x6f,
-	0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x1a, 0x46,
-	0x0a, 0x0c, 0x50, 0x32, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x17,
-	0x0a, 0x07, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x70, 0x65, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69,
-	0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x75, 0x62,
-	0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x1a, 0xbf, 0x01, 0x0a, 0x0c, 0x4f, 0x43, 0x52, 0x4b, 0x65,
-	0x79, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x62, 0x75, 0x6e, 0x64, 0x6c,
-	0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x75, 0x6e, 0x64,
-	0x6c, 0x65, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70,
-	0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79,
-	0x12, 0x2e, 0x0a, 0x13, 0x6f, 0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x70, 0x75, 0x62,
-	0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x6f,
-	0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79,
-	0x12, 0x36, 0x0a, 0x17, 0x6f, 0x6e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x73, 0x69, 0x67, 0x6e,
-	0x69, 0x6e, 0x67, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x15, 0x6f, 0x6e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e,
-	0x67, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x1a, 0x8d, 0x01, 0x0a, 0x07, 0x50, 0x6c, 0x75,
-	0x67, 0x69, 0x6e, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x18, 0x0a, 0x07,
-	0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65,
-	0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x6e, 0x12, 0x18,
-	0x0a, 0x07, 0x6d, 0x65, 0x72, 0x63, 0x75, 0x72, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x07, 0x6d, 0x65, 0x72, 0x63, 0x75, 0x72, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x62, 0x61,
-	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x72, 0x65,
-	0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x22, 0xf9, 0x01, 0x0a, 0x0b, 0x43, 0x68, 0x61,
-	0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x28, 0x0a, 0x05, 0x63, 0x68, 0x61, 0x69,
-	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f,
-	0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x05, 0x63, 0x68, 0x61,
-	0x69, 0x6e, 0x12, 0x27, 0x0a, 0x0f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x63, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x61,
-	0x64, 0x6d, 0x69, 0x6e, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0c, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x12, 0x38, 0x0a, 0x0b, 0x6f, 0x63, 0x72, 0x31, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x43, 0x52, 0x31, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a,
-	0x6f, 0x63, 0x72, 0x31, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x38, 0x0a, 0x0b, 0x6f, 0x63,
-	0x72, 0x32, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x43,
-	0x52, 0x32, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x6f, 0x63, 0x72, 0x32, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x38, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4e, 0x6f, 0x64,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x04, 0x6e, 0x6f, 0x64,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f,
-	0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65,
-	0x22, 0xd7, 0x01, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3c, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x1a, 0x84, 0x01, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x10,
-	0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73,
-	0x12, 0x35, 0x0a, 0x08, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x08, 0x61,
-	0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x64, 0x12, 0x31, 0x0a, 0x09, 0x73, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52,
-	0x09, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x22, 0x3c, 0x0a, 0x11, 0x4c, 0x69,
-	0x73, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x27, 0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x64,
-	0x65, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x22, 0x89, 0x01, 0x0a, 0x1b, 0x4c, 0x69, 0x73,
-	0x74, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x47, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e,
-	0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x43,
-	0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x1a, 0x21, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x6e,
-	0x6f, 0x64, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f,
-	0x64, 0x65, 0x49, 0x64, 0x22, 0x5d, 0x0a, 0x1c, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x64, 0x65,
-	0x43, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x0d, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x73, 0x2a, 0x52, 0x0a, 0x09, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x1a, 0x0a, 0x16, 0x43, 0x48, 0x41, 0x49, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55,
-	0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e,
-	0x43, 0x48, 0x41, 0x49, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x56, 0x4d, 0x10, 0x01,
-	0x12, 0x15, 0x0a, 0x11, 0x43, 0x48, 0x41, 0x49, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53,
-	0x4f, 0x4c, 0x41, 0x4e, 0x41, 0x10, 0x02, 0x2a, 0x63, 0x0a, 0x0c, 0x41, 0x72, 0x63, 0x68, 0x69,
-	0x76, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x0a, 0x19, 0x41, 0x52, 0x43, 0x48, 0x49,
-	0x56, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
-	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x41, 0x52, 0x43, 0x48, 0x49, 0x56,
-	0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x41, 0x52, 0x43, 0x48, 0x49, 0x56, 0x45, 0x44,
-	0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x41, 0x52, 0x43, 0x48, 0x49, 0x56, 0x45, 0x5f, 0x53, 0x54,
-	0x41, 0x54, 0x45, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x56, 0x45, 0x10, 0x02, 0x32, 0x92, 0x02, 0x0a,
-	0x0b, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x46, 0x0a, 0x07,
-	0x47, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x1b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f,
-	0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x4c, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x64, 0x65,
-	0x73, 0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
-	0x69, 0x73, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x6d, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x68,
-	0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x28, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x64,
-	0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x42, 0x09, 0x5a, 0x07, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_node_v1_node_proto_rawDescOnce sync.Once
-	file_node_v1_node_proto_rawDescData = file_node_v1_node_proto_rawDesc
-)
-
-func file_node_v1_node_proto_rawDescGZIP() []byte {
-	file_node_v1_node_proto_rawDescOnce.Do(func() {
-		file_node_v1_node_proto_rawDescData = protoimpl.X.CompressGZIP(file_node_v1_node_proto_rawDescData)
-	})
-	return file_node_v1_node_proto_rawDescData
-}
-
-var file_node_v1_node_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_node_v1_node_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
-var file_node_v1_node_proto_goTypes = []interface{}{
-	(ChainType)(0),                             // 0: api.node.v1.ChainType
-	(ArchiveState)(0),                          // 1: api.node.v1.ArchiveState
-	(*Chain)(nil),                              // 2: api.node.v1.Chain
-	(*OCR1Config)(nil),                         // 3: api.node.v1.OCR1Config
-	(*OCR2Config)(nil),                         // 4: api.node.v1.OCR2Config
-	(*ChainConfig)(nil),                        // 5: api.node.v1.ChainConfig
-	(*GetNodeRequest)(nil),                     // 6: api.node.v1.GetNodeRequest
-	(*GetNodeResponse)(nil),                    // 7: api.node.v1.GetNodeResponse
-	(*ListNodesRequest)(nil),                   // 8: api.node.v1.ListNodesRequest
-	(*ListNodesResponse)(nil),                  // 9: api.node.v1.ListNodesResponse
-	(*ListNodeChainConfigsRequest)(nil),        // 10: api.node.v1.ListNodeChainConfigsRequest
-	(*ListNodeChainConfigsResponse)(nil),       // 11: api.node.v1.ListNodeChainConfigsResponse
-	(*OCR1Config_P2PKeyBundle)(nil),            // 12: api.node.v1.OCR1Config.P2PKeyBundle
-	(*OCR1Config_OCRKeyBundle)(nil),            // 13: api.node.v1.OCR1Config.OCRKeyBundle
-	(*OCR2Config_P2PKeyBundle)(nil),            // 14: api.node.v1.OCR2Config.P2PKeyBundle
-	(*OCR2Config_OCRKeyBundle)(nil),            // 15: api.node.v1.OCR2Config.OCRKeyBundle
-	(*OCR2Config_Plugins)(nil),                 // 16: api.node.v1.OCR2Config.Plugins
-	(*ListNodesRequest_Filter)(nil),            // 17: api.node.v1.ListNodesRequest.Filter
-	(*ListNodeChainConfigsRequest_Filter)(nil), // 18: api.node.v1.ListNodeChainConfigsRequest.Filter
-	(*Node)(nil),                               // 19: api.node.v1.Node
-	(*ptypes.Selector)(nil),                    // 20: api.label.Selector
-}
-var file_node_v1_node_proto_depIdxs = []int32{
-	0,  // 0: api.node.v1.Chain.type:type_name -> api.node.v1.ChainType
-	12, // 1: api.node.v1.OCR1Config.p2p_key_bundle:type_name -> api.node.v1.OCR1Config.P2PKeyBundle
-	13, // 2: api.node.v1.OCR1Config.ocr_key_bundle:type_name -> api.node.v1.OCR1Config.OCRKeyBundle
-	14, // 3: api.node.v1.OCR2Config.p2p_key_bundle:type_name -> api.node.v1.OCR2Config.P2PKeyBundle
-	15, // 4: api.node.v1.OCR2Config.ocr_key_bundle:type_name -> api.node.v1.OCR2Config.OCRKeyBundle
-	16, // 5: api.node.v1.OCR2Config.plugins:type_name -> api.node.v1.OCR2Config.Plugins
-	2,  // 6: api.node.v1.ChainConfig.chain:type_name -> api.node.v1.Chain
-	3,  // 7: api.node.v1.ChainConfig.ocr1_config:type_name -> api.node.v1.OCR1Config
-	4,  // 8: api.node.v1.ChainConfig.ocr2_config:type_name -> api.node.v1.OCR2Config
-	19, // 9: api.node.v1.GetNodeResponse.node:type_name -> api.node.v1.Node
-	17, // 10: api.node.v1.ListNodesRequest.filter:type_name -> api.node.v1.ListNodesRequest.Filter
-	19, // 11: api.node.v1.ListNodesResponse.nodes:type_name -> api.node.v1.Node
-	18, // 12: api.node.v1.ListNodeChainConfigsRequest.filter:type_name -> api.node.v1.ListNodeChainConfigsRequest.Filter
-	5,  // 13: api.node.v1.ListNodeChainConfigsResponse.chain_configs:type_name -> api.node.v1.ChainConfig
-	1,  // 14: api.node.v1.ListNodesRequest.Filter.archived:type_name -> api.node.v1.ArchiveState
-	20, // 15: api.node.v1.ListNodesRequest.Filter.selectors:type_name -> api.label.Selector
-	6,  // 16: api.node.v1.NodeService.GetNode:input_type -> api.node.v1.GetNodeRequest
-	8,  // 17: api.node.v1.NodeService.ListNodes:input_type -> api.node.v1.ListNodesRequest
-	10, // 18: api.node.v1.NodeService.ListNodeChainConfigs:input_type -> api.node.v1.ListNodeChainConfigsRequest
-	7,  // 19: api.node.v1.NodeService.GetNode:output_type -> api.node.v1.GetNodeResponse
-	9,  // 20: api.node.v1.NodeService.ListNodes:output_type -> api.node.v1.ListNodesResponse
-	11, // 21: api.node.v1.NodeService.ListNodeChainConfigs:output_type -> api.node.v1.ListNodeChainConfigsResponse
-	19, // [19:22] is the sub-list for method output_type
-	16, // [16:19] is the sub-list for method input_type
-	16, // [16:16] is the sub-list for extension type_name
-	16, // [16:16] is the sub-list for extension extendee
-	0,  // [0:16] is the sub-list for field type_name
-}
-
-func init() { file_node_v1_node_proto_init() }
-func file_node_v1_node_proto_init() {
-	if File_node_v1_node_proto != nil {
-		return
-	}
-	file_node_v1_shared_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_node_v1_node_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Chain); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OCR1Config); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OCR2Config); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChainConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetNodeRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetNodeResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListNodesRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListNodesResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListNodeChainConfigsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListNodeChainConfigsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OCR1Config_P2PKeyBundle); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OCR1Config_OCRKeyBundle); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OCR2Config_P2PKeyBundle); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OCR2Config_OCRKeyBundle); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OCR2Config_Plugins); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListNodesRequest_Filter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_node_v1_node_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListNodeChainConfigsRequest_Filter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_node_v1_node_proto_rawDesc,
-			NumEnums:      2,
-			NumMessages:   17,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_node_v1_node_proto_goTypes,
-		DependencyIndexes: file_node_v1_node_proto_depIdxs,
-		EnumInfos:         file_node_v1_node_proto_enumTypes,
-		MessageInfos:      file_node_v1_node_proto_msgTypes,
-	}.Build()
-	File_node_v1_node_proto = out.File
-	file_node_v1_node_proto_rawDesc = nil
-	file_node_v1_node_proto_goTypes = nil
-	file_node_v1_node_proto_depIdxs = nil
-}
diff --git a/integration-tests/deployment/jd/node/v1/node_grpc.pb.go b/integration-tests/deployment/jd/node/v1/node_grpc.pb.go
deleted file mode 100644
index 5fc0c505ee..0000000000
--- a/integration-tests/deployment/jd/node/v1/node_grpc.pb.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.3.0
-// - protoc             v4.25.3
-// source: node/v1/node.proto
-
-package v1
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-const (
-	NodeService_GetNode_FullMethodName              = "/api.node.v1.NodeService/GetNode"
-	NodeService_ListNodes_FullMethodName            = "/api.node.v1.NodeService/ListNodes"
-	NodeService_ListNodeChainConfigs_FullMethodName = "/api.node.v1.NodeService/ListNodeChainConfigs"
-)
-
-// NodeServiceClient is the client API for NodeService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type NodeServiceClient interface {
-	// GetNode retrieves the details of a node by its unique identifier.
-	GetNode(ctx context.Context, in *GetNodeRequest, opts ...grpc.CallOption) (*GetNodeResponse, error)
-	// ListNodes returns a list of nodes, optionally filtered by the provided criteria.
-	ListNodes(ctx context.Context, in *ListNodesRequest, opts ...grpc.CallOption) (*ListNodesResponse, error)
-	ListNodeChainConfigs(ctx context.Context, in *ListNodeChainConfigsRequest, opts ...grpc.CallOption) (*ListNodeChainConfigsResponse, error)
-}
-
-type nodeServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewNodeServiceClient(cc grpc.ClientConnInterface) NodeServiceClient {
-	return &nodeServiceClient{cc}
-}
-
-func (c *nodeServiceClient) GetNode(ctx context.Context, in *GetNodeRequest, opts ...grpc.CallOption) (*GetNodeResponse, error) {
-	out := new(GetNodeResponse)
-	err := c.cc.Invoke(ctx, NodeService_GetNode_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *nodeServiceClient) ListNodes(ctx context.Context, in *ListNodesRequest, opts ...grpc.CallOption) (*ListNodesResponse, error) {
-	out := new(ListNodesResponse)
-	err := c.cc.Invoke(ctx, NodeService_ListNodes_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *nodeServiceClient) ListNodeChainConfigs(ctx context.Context, in *ListNodeChainConfigsRequest, opts ...grpc.CallOption) (*ListNodeChainConfigsResponse, error) {
-	out := new(ListNodeChainConfigsResponse)
-	err := c.cc.Invoke(ctx, NodeService_ListNodeChainConfigs_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// NodeServiceServer is the server API for NodeService service.
-// All implementations must embed UnimplementedNodeServiceServer
-// for forward compatibility
-type NodeServiceServer interface {
-	// GetNode retrieves the details of a node by its unique identifier.
-	GetNode(context.Context, *GetNodeRequest) (*GetNodeResponse, error)
-	// ListNodes returns a list of nodes, optionally filtered by the provided criteria.
-	ListNodes(context.Context, *ListNodesRequest) (*ListNodesResponse, error)
-	ListNodeChainConfigs(context.Context, *ListNodeChainConfigsRequest) (*ListNodeChainConfigsResponse, error)
-	mustEmbedUnimplementedNodeServiceServer()
-}
-
-// UnimplementedNodeServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedNodeServiceServer struct {
-}
-
-func (UnimplementedNodeServiceServer) GetNode(context.Context, *GetNodeRequest) (*GetNodeResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetNode not implemented")
-}
-func (UnimplementedNodeServiceServer) ListNodes(context.Context, *ListNodesRequest) (*ListNodesResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ListNodes not implemented")
-}
-func (UnimplementedNodeServiceServer) ListNodeChainConfigs(context.Context, *ListNodeChainConfigsRequest) (*ListNodeChainConfigsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ListNodeChainConfigs not implemented")
-}
-func (UnimplementedNodeServiceServer) mustEmbedUnimplementedNodeServiceServer() {}
-
-// UnsafeNodeServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to NodeServiceServer will
-// result in compilation errors.
-type UnsafeNodeServiceServer interface {
-	mustEmbedUnimplementedNodeServiceServer()
-}
-
-func RegisterNodeServiceServer(s grpc.ServiceRegistrar, srv NodeServiceServer) {
-	s.RegisterService(&NodeService_ServiceDesc, srv)
-}
-
-func _NodeService_GetNode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetNodeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(NodeServiceServer).GetNode(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: NodeService_GetNode_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(NodeServiceServer).GetNode(ctx, req.(*GetNodeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _NodeService_ListNodes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListNodesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(NodeServiceServer).ListNodes(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: NodeService_ListNodes_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(NodeServiceServer).ListNodes(ctx, req.(*ListNodesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _NodeService_ListNodeChainConfigs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListNodeChainConfigsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(NodeServiceServer).ListNodeChainConfigs(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: NodeService_ListNodeChainConfigs_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(NodeServiceServer).ListNodeChainConfigs(ctx, req.(*ListNodeChainConfigsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// NodeService_ServiceDesc is the grpc.ServiceDesc for NodeService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var NodeService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "api.node.v1.NodeService",
-	HandlerType: (*NodeServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "GetNode",
-			Handler:    _NodeService_GetNode_Handler,
-		},
-		{
-			MethodName: "ListNodes",
-			Handler:    _NodeService_ListNodes_Handler,
-		},
-		{
-			MethodName: "ListNodeChainConfigs",
-			Handler:    _NodeService_ListNodeChainConfigs_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "node/v1/node.proto",
-}
diff --git a/integration-tests/deployment/jd/node/v1/shared.pb.go b/integration-tests/deployment/jd/node/v1/shared.pb.go
deleted file mode 100644
index 4099dd6bd7..0000000000
--- a/integration-tests/deployment/jd/node/v1/shared.pb.go
+++ /dev/null
@@ -1,239 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.29.0
-// 	protoc        v4.25.3
-// source: node/v1/shared.proto
-
-package v1
-
-import (
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/jd/shared/ptypes"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// Node represents a node within the Job Distributor system.
-type Node struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id          string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`                                       // Unique identifier for the node.
-	Name        string                 `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`                                   // Human-readable name for the node.
-	PublicKey   string                 `protobuf:"bytes,3,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"`        // Public key used for secure communications.
-	IsEnabled   bool                   `protobuf:"varint,4,opt,name=is_enabled,json=isEnabled,proto3" json:"is_enabled,omitempty"`       // Indicates if the node is currently enabled.
-	IsConnected bool                   `protobuf:"varint,5,opt,name=is_connected,json=isConnected,proto3" json:"is_connected,omitempty"` // Indicates if the node is currently connected to the network.
-	Labels      []*ptypes.Label        `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty"`                               // Set of labels associated with the node.
-	CreatedAt   *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`        // Timestamp when the node was created.
-	UpdatedAt   *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`        // Timestamp when the node was last updated.
-	ArchivedAt  *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=archived_at,json=archivedAt,proto3" json:"archived_at,omitempty"`     // Timestamp when the node was archived.
-}
-
-func (x *Node) Reset() {
-	*x = Node{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_node_v1_shared_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Node) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Node) ProtoMessage() {}
-
-func (x *Node) ProtoReflect() protoreflect.Message {
-	mi := &file_node_v1_shared_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Node.ProtoReflect.Descriptor instead.
-func (*Node) Descriptor() ([]byte, []int) {
-	return file_node_v1_shared_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Node) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *Node) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *Node) GetPublicKey() string {
-	if x != nil {
-		return x.PublicKey
-	}
-	return ""
-}
-
-func (x *Node) GetIsEnabled() bool {
-	if x != nil {
-		return x.IsEnabled
-	}
-	return false
-}
-
-func (x *Node) GetIsConnected() bool {
-	if x != nil {
-		return x.IsConnected
-	}
-	return false
-}
-
-func (x *Node) GetLabels() []*ptypes.Label {
-	if x != nil {
-		return x.Labels
-	}
-	return nil
-}
-
-func (x *Node) GetCreatedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.CreatedAt
-	}
-	return nil
-}
-
-func (x *Node) GetUpdatedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.UpdatedAt
-	}
-	return nil
-}
-
-func (x *Node) GetArchivedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.ArchivedAt
-	}
-	return nil
-}
-
-var File_node_v1_shared_proto protoreflect.FileDescriptor
-
-var file_node_v1_shared_proto_rawDesc = []byte{
-	0x0a, 0x14, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0b, 0x61, 0x70, 0x69, 0x2e, 0x6e, 0x6f, 0x64, 0x65,
-	0x2e, 0x76, 0x31, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2f, 0x70, 0x74, 0x79,
-	0x70, 0x65, 0x73, 0x2f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xe8, 0x02, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a,
-	0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x69,
-	0x73, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x09, 0x69, 0x73, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73,
-	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0b, 0x69, 0x73, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x12, 0x28, 0x0a,
-	0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x52,
-	0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69,
-	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x41, 0x74, 0x12, 0x39, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74,
-	0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x6d, 0x70, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x3b, 0x0a,
-	0x0b, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a,
-	0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x64, 0x41, 0x74, 0x42, 0x09, 0x5a, 0x07, 0x6e, 0x6f,
-	0x64, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_node_v1_shared_proto_rawDescOnce sync.Once
-	file_node_v1_shared_proto_rawDescData = file_node_v1_shared_proto_rawDesc
-)
-
-func file_node_v1_shared_proto_rawDescGZIP() []byte {
-	file_node_v1_shared_proto_rawDescOnce.Do(func() {
-		file_node_v1_shared_proto_rawDescData = protoimpl.X.CompressGZIP(file_node_v1_shared_proto_rawDescData)
-	})
-	return file_node_v1_shared_proto_rawDescData
-}
-
-var file_node_v1_shared_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_node_v1_shared_proto_goTypes = []interface{}{
-	(*Node)(nil),                  // 0: api.node.v1.Node
-	(*ptypes.Label)(nil),          // 1: api.label.Label
-	(*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp
-}
-var file_node_v1_shared_proto_depIdxs = []int32{
-	1, // 0: api.node.v1.Node.labels:type_name -> api.label.Label
-	2, // 1: api.node.v1.Node.created_at:type_name -> google.protobuf.Timestamp
-	2, // 2: api.node.v1.Node.updated_at:type_name -> google.protobuf.Timestamp
-	2, // 3: api.node.v1.Node.archived_at:type_name -> google.protobuf.Timestamp
-	4, // [4:4] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for method input_type
-	4, // [4:4] is the sub-list for extension type_name
-	4, // [4:4] is the sub-list for extension extendee
-	0, // [0:4] is the sub-list for field type_name
-}
-
-func init() { file_node_v1_shared_proto_init() }
-func file_node_v1_shared_proto_init() {
-	if File_node_v1_shared_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_node_v1_shared_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Node); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_node_v1_shared_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_node_v1_shared_proto_goTypes,
-		DependencyIndexes: file_node_v1_shared_proto_depIdxs,
-		MessageInfos:      file_node_v1_shared_proto_msgTypes,
-	}.Build()
-	File_node_v1_shared_proto = out.File
-	file_node_v1_shared_proto_rawDesc = nil
-	file_node_v1_shared_proto_goTypes = nil
-	file_node_v1_shared_proto_depIdxs = nil
-}
diff --git a/integration-tests/deployment/jd/shared/ptypes/label.pb.go b/integration-tests/deployment/jd/shared/ptypes/label.pb.go
deleted file mode 100644
index e8195bd6c3..0000000000
--- a/integration-tests/deployment/jd/shared/ptypes/label.pb.go
+++ /dev/null
@@ -1,311 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.29.0
-// 	protoc        v4.25.3
-// source: shared/ptypes/label.proto
-
-package ptypes
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// SelectorOp defines the operation to be used in a selector
-type SelectorOp int32
-
-const (
-	SelectorOp_EQ        SelectorOp = 0
-	SelectorOp_NOT_EQ    SelectorOp = 1
-	SelectorOp_IN        SelectorOp = 2
-	SelectorOp_NOT_IN    SelectorOp = 3
-	SelectorOp_EXIST     SelectorOp = 4
-	SelectorOp_NOT_EXIST SelectorOp = 5
-)
-
-// Enum value maps for SelectorOp.
-var (
-	SelectorOp_name = map[int32]string{
-		0: "EQ",
-		1: "NOT_EQ",
-		2: "IN",
-		3: "NOT_IN",
-		4: "EXIST",
-		5: "NOT_EXIST",
-	}
-	SelectorOp_value = map[string]int32{
-		"EQ":        0,
-		"NOT_EQ":    1,
-		"IN":        2,
-		"NOT_IN":    3,
-		"EXIST":     4,
-		"NOT_EXIST": 5,
-	}
-)
-
-func (x SelectorOp) Enum() *SelectorOp {
-	p := new(SelectorOp)
-	*p = x
-	return p
-}
-
-func (x SelectorOp) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (SelectorOp) Descriptor() protoreflect.EnumDescriptor {
-	return file_shared_ptypes_label_proto_enumTypes[0].Descriptor()
-}
-
-func (SelectorOp) Type() protoreflect.EnumType {
-	return &file_shared_ptypes_label_proto_enumTypes[0]
-}
-
-func (x SelectorOp) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use SelectorOp.Descriptor instead.
-func (SelectorOp) EnumDescriptor() ([]byte, []int) {
-	return file_shared_ptypes_label_proto_rawDescGZIP(), []int{0}
-}
-
-// Label defines a label as a key value pair
-type Label struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Key   string  `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-	Value *string `protobuf:"bytes,2,opt,name=value,proto3,oneof" json:"value,omitempty"`
-}
-
-func (x *Label) Reset() {
-	*x = Label{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_shared_ptypes_label_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Label) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Label) ProtoMessage() {}
-
-func (x *Label) ProtoReflect() protoreflect.Message {
-	mi := &file_shared_ptypes_label_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Label.ProtoReflect.Descriptor instead.
-func (*Label) Descriptor() ([]byte, []int) {
-	return file_shared_ptypes_label_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Label) GetKey() string {
-	if x != nil {
-		return x.Key
-	}
-	return ""
-}
-
-func (x *Label) GetValue() string {
-	if x != nil && x.Value != nil {
-		return *x.Value
-	}
-	return ""
-}
-
-// Selector defines a selector as a key value pair with an operation
-type Selector struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Key   string     `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-	Op    SelectorOp `protobuf:"varint,2,opt,name=op,proto3,enum=api.label.SelectorOp" json:"op,omitempty"`
-	Value *string    `protobuf:"bytes,3,opt,name=value,proto3,oneof" json:"value,omitempty"`
-}
-
-func (x *Selector) Reset() {
-	*x = Selector{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_shared_ptypes_label_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Selector) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Selector) ProtoMessage() {}
-
-func (x *Selector) ProtoReflect() protoreflect.Message {
-	mi := &file_shared_ptypes_label_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Selector.ProtoReflect.Descriptor instead.
-func (*Selector) Descriptor() ([]byte, []int) {
-	return file_shared_ptypes_label_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Selector) GetKey() string {
-	if x != nil {
-		return x.Key
-	}
-	return ""
-}
-
-func (x *Selector) GetOp() SelectorOp {
-	if x != nil {
-		return x.Op
-	}
-	return SelectorOp_EQ
-}
-
-func (x *Selector) GetValue() string {
-	if x != nil && x.Value != nil {
-		return *x.Value
-	}
-	return ""
-}
-
-var File_shared_ptypes_label_proto protoreflect.FileDescriptor
-
-var file_shared_ptypes_label_proto_rawDesc = []byte{
-	0x0a, 0x19, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2f, 0x70, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f,
-	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x61, 0x70, 0x69,
-	0x2e, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x0a, 0x05, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x19, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x48, 0x00, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06,
-	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x68, 0x0a, 0x08, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x02, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x15, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x2e, 0x53, 0x65, 0x6c,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x4f, 0x70, 0x52, 0x02, 0x6f, 0x70, 0x12, 0x19, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x2a, 0x4e, 0x0a, 0x0a, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x4f, 0x70, 0x12, 0x06,
-	0x0a, 0x02, 0x45, 0x51, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x51,
-	0x10, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x4f,
-	0x54, 0x5f, 0x49, 0x4e, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10,
-	0x04, 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x05,
-	0x42, 0x47, 0x5a, 0x45, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73,
-	0x6d, 0x61, 0x72, 0x74, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6b, 0x69, 0x74, 0x2f,
-	0x6a, 0x6f, 0x62, 0x2d, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x6f, 0x72, 0x2f,
-	0x70, 0x6b, 0x67, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x73, 0x68, 0x61, 0x72,
-	0x65, 0x64, 0x2f, 0x70, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
-}
-
-var (
-	file_shared_ptypes_label_proto_rawDescOnce sync.Once
-	file_shared_ptypes_label_proto_rawDescData = file_shared_ptypes_label_proto_rawDesc
-)
-
-func file_shared_ptypes_label_proto_rawDescGZIP() []byte {
-	file_shared_ptypes_label_proto_rawDescOnce.Do(func() {
-		file_shared_ptypes_label_proto_rawDescData = protoimpl.X.CompressGZIP(file_shared_ptypes_label_proto_rawDescData)
-	})
-	return file_shared_ptypes_label_proto_rawDescData
-}
-
-var file_shared_ptypes_label_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_shared_ptypes_label_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_shared_ptypes_label_proto_goTypes = []interface{}{
-	(SelectorOp)(0),  // 0: api.label.SelectorOp
-	(*Label)(nil),    // 1: api.label.Label
-	(*Selector)(nil), // 2: api.label.Selector
-}
-var file_shared_ptypes_label_proto_depIdxs = []int32{
-	0, // 0: api.label.Selector.op:type_name -> api.label.SelectorOp
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_shared_ptypes_label_proto_init() }
-func file_shared_ptypes_label_proto_init() {
-	if File_shared_ptypes_label_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_shared_ptypes_label_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Label); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_shared_ptypes_label_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Selector); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_shared_ptypes_label_proto_msgTypes[0].OneofWrappers = []interface{}{}
-	file_shared_ptypes_label_proto_msgTypes[1].OneofWrappers = []interface{}{}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_shared_ptypes_label_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_shared_ptypes_label_proto_goTypes,
-		DependencyIndexes: file_shared_ptypes_label_proto_depIdxs,
-		EnumInfos:         file_shared_ptypes_label_proto_enumTypes,
-		MessageInfos:      file_shared_ptypes_label_proto_msgTypes,
-	}.Build()
-	File_shared_ptypes_label_proto = out.File
-	file_shared_ptypes_label_proto_rawDesc = nil
-	file_shared_ptypes_label_proto_goTypes = nil
-	file_shared_ptypes_label_proto_depIdxs = nil
-}
diff --git a/integration-tests/deployment/memory/chain.go b/integration-tests/deployment/memory/chain.go
deleted file mode 100644
index 153d9d19e9..0000000000
--- a/integration-tests/deployment/memory/chain.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package memory
-
-import (
-	"math/big"
-	"testing"
-	"time"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	gethtypes "github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
-	chainsel "github.com/smartcontractkit/chain-selectors"
-	"github.com/stretchr/testify/require"
-)
-
-type EVMChain struct {
-	Backend     *backends.SimulatedBackend
-	DeployerKey *bind.TransactOpts
-}
-
-// CCIP relies on block timestamps, but SimulatedBackend uses by default clock starting from 1970-01-01
-// This trick is used to move the clock closer to the current time. We set first block to be X hours ago.
-// Tests create plenty of transactions so this number can't be too low, every new block mined will tick the clock,
-// if you mine more than "X hours" transactions, SimulatedBackend will panic because generated timestamps will be in the future.
-func tweakChainTimestamp(t *testing.T, backend *backends.SimulatedBackend, tweak time.Duration) {
-	blockTime := time.Unix(int64(backend.Blockchain().CurrentHeader().Time), 0)
-	sinceBlockTime := time.Since(blockTime)
-	diff := sinceBlockTime - tweak
-	err := backend.AdjustTime(diff)
-	require.NoError(t, err, "unable to adjust time on simulated chain")
-	backend.Commit()
-	backend.Commit()
-}
-
-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)
-	require.NoError(t, err)
-	gp, err := backend.SuggestGasPrice(Context(t))
-	require.NoError(t, err)
-	rawTx := gethtypes.NewTx(&gethtypes.LegacyTx{
-		Nonce:    nonce,
-		GasPrice: gp,
-		Gas:      21000,
-		To:       &to,
-		Value:    amount,
-	})
-	signedTx, err := from.Signer(from.From, rawTx)
-	require.NoError(t, err)
-	err = backend.SendTransaction(Context(t), signedTx)
-	require.NoError(t, err)
-	backend.Commit()
-}
-
-func GenerateChains(t *testing.T, numChains int) map[uint64]EVMChain {
-	chains := make(map[uint64]EVMChain)
-	for i := 0; i < numChains; i++ {
-		chainID := chainsel.TEST_90000001.EvmChainID + uint64(i)
-		key, err := crypto.GenerateKey()
-		require.NoError(t, err)
-		owner, err := bind.NewKeyedTransactorWithChainID(key, big.NewInt(1337))
-		require.NoError(t, err)
-		backend := backends.NewSimulatedBackend(core.GenesisAlloc{
-			owner.From: {Balance: big.NewInt(0).Mul(big.NewInt(100), big.NewInt(params.Ether))}}, 10000000)
-		tweakChainTimestamp(t, backend, time.Hour*8)
-		chains[chainID] = EVMChain{
-			Backend:     backend,
-			DeployerKey: owner,
-		}
-	}
-	return chains
-}
diff --git a/integration-tests/deployment/memory/environment.go b/integration-tests/deployment/memory/environment.go
deleted file mode 100644
index d496d173c0..0000000000
--- a/integration-tests/deployment/memory/environment.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package memory
-
-import (
-	"context"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/hashicorp/consul/sdk/freeport"
-	chainsel "github.com/smartcontractkit/chain-selectors"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap/zapcore"
-
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/logger"
-)
-
-const (
-	Memory = "memory"
-)
-
-type MemoryEnvironmentConfig struct {
-	Chains         int
-	Nodes          int
-	Bootstraps     int
-	RegistryConfig RegistryConfig
-}
-
-// Needed for environment variables on the node which point to prexisitng addresses.
-// i.e. CapReg.
-func NewMemoryChains(t *testing.T, numChains int) map[uint64]deployment.Chain {
-	mchains := GenerateChains(t, numChains)
-	chains := make(map[uint64]deployment.Chain)
-	for cid, chain := range mchains {
-		sel, err := chainsel.SelectorFromChainId(cid)
-		require.NoError(t, err)
-		chains[sel] = deployment.Chain{
-			Selector:    sel,
-			Client:      chain.Backend,
-			DeployerKey: chain.DeployerKey,
-			Confirm: func(tx common.Hash) error {
-				for {
-					chain.Backend.Commit()
-					receipt, err := chain.Backend.TransactionReceipt(context.Background(), tx)
-					if err != nil {
-						t.Log("failed to get receipt", err)
-						continue
-					}
-					if receipt.Status == 0 {
-						t.Logf("Status (reverted) %d for txhash %s\n", receipt.Status, tx.String())
-					}
-					return nil
-				}
-			},
-		}
-	}
-	return chains
-}
-
-func NewNodes(t *testing.T, logLevel zapcore.Level, chains map[uint64]deployment.Chain, numNodes, numBootstraps int, registryConfig RegistryConfig) map[string]Node {
-	mchains := make(map[uint64]EVMChain)
-	for _, chain := range chains {
-		evmChainID, err := chainsel.ChainIdFromSelector(chain.Selector)
-		if err != nil {
-			t.Fatal(err)
-		}
-		mchains[evmChainID] = EVMChain{
-			Backend:     chain.Client.(*backends.SimulatedBackend),
-			DeployerKey: chain.DeployerKey,
-		}
-	}
-	nodesByPeerID := make(map[string]Node)
-	ports := freeport.GetN(t, numNodes)
-	var existingNumBootstraps int
-	for i := 0; i < numNodes; i++ {
-		bootstrap := false
-		if existingNumBootstraps < numBootstraps {
-			bootstrap = true
-			existingNumBootstraps++
-		}
-		node := NewNode(t, ports[i], mchains, logLevel, bootstrap, registryConfig)
-		nodesByPeerID[node.Keys.PeerID.String()] = *node
-		// Note in real env, this ID is allocated by JD.
-	}
-	return nodesByPeerID
-}
-
-func NewMemoryEnvironmentFromChainsNodes(t *testing.T,
-	lggr logger.Logger,
-	chains map[uint64]deployment.Chain,
-	nodes map[string]Node) deployment.Environment {
-	var nodeIDs []string
-	for id := range nodes {
-		nodeIDs = append(nodeIDs, id)
-	}
-	return deployment.Environment{
-		Name:     Memory,
-		Offchain: NewMemoryJobClient(nodes),
-		// Note these have the p2p_ prefix.
-		NodeIDs: nodeIDs,
-		Chains:  chains,
-		Logger:  lggr,
-	}
-}
-
-//func NewMemoryEnvironmentExistingChains(t *testing.T, lggr logger.Logger,
-//	chains map[uint64]deployment.Chain, config MemoryEnvironmentConfig) deployment.Environment {
-//	nodes := NewNodes(t, chains, config.Nodes, config.Bootstraps, config.RegistryConfig)
-//	var nodeIDs []string
-//	for id := range nodes {
-//		nodeIDs = append(nodeIDs, id)
-//	}
-//	return deployment.Environment{
-//		Name:     Memory,
-//		Offchain: NewMemoryJobClient(nodes),
-//		// Note these have the p2p_ prefix.
-//		NodeIDs: nodeIDs,
-//		Chains:  chains,
-//		Logger:  lggr,
-//	}
-//}
-
-// To be used by tests and any kind of deployment logic.
-func NewMemoryEnvironment(t *testing.T, lggr logger.Logger, logLevel zapcore.Level, config MemoryEnvironmentConfig) deployment.Environment {
-	chains := NewMemoryChains(t, config.Chains)
-	nodes := NewNodes(t, logLevel, chains, config.Nodes, config.Bootstraps, config.RegistryConfig)
-	var nodeIDs []string
-	for id := range nodes {
-		nodeIDs = append(nodeIDs, id)
-	}
-	return deployment.Environment{
-		Name:     Memory,
-		Offchain: NewMemoryJobClient(nodes),
-		NodeIDs:  nodeIDs,
-		Chains:   chains,
-		Logger:   lggr,
-	}
-}
diff --git a/integration-tests/deployment/memory/job_client.go b/integration-tests/deployment/memory/job_client.go
deleted file mode 100644
index a9e837eab2..0000000000
--- a/integration-tests/deployment/memory/job_client.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package memory
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/ethereum/go-ethereum/common"
-	"google.golang.org/grpc"
-
-	jobv1 "github.com/smartcontractkit/chainlink/integration-tests/deployment/jd/job/v1"
-	nodev1 "github.com/smartcontractkit/chainlink/integration-tests/deployment/jd/node/v1"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/validate"
-)
-
-type JobClient struct {
-	Nodes map[string]Node
-}
-
-func (j JobClient) GetNode(ctx context.Context, in *nodev1.GetNodeRequest, opts ...grpc.CallOption) (*nodev1.GetNodeResponse, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (j JobClient) ListNodes(ctx context.Context, in *nodev1.ListNodesRequest, opts ...grpc.CallOption) (*nodev1.ListNodesResponse, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (j JobClient) ListNodeChainConfigs(ctx context.Context, in *nodev1.ListNodeChainConfigsRequest, opts ...grpc.CallOption) (*nodev1.ListNodeChainConfigsResponse, error) {
-	n := j.Nodes[in.Filter.NodeId]
-	offpk := n.Keys.OCRKeyBundle.OffchainPublicKey()
-	cpk := n.Keys.OCRKeyBundle.ConfigEncryptionPublicKey()
-	var chainConfigs []*nodev1.ChainConfig
-	for evmChainID, transmitter := range n.Keys.TransmittersByEVMChainID {
-		chainConfigs = append(chainConfigs, &nodev1.ChainConfig{
-			Chain: &nodev1.Chain{
-				Id:   strconv.Itoa(int(evmChainID)),
-				Type: nodev1.ChainType_CHAIN_TYPE_EVM,
-			},
-			AccountAddress: transmitter.String(),
-			AdminAddress:   "",
-			Ocr1Config:     nil,
-			Ocr2Config: &nodev1.OCR2Config{
-				Enabled:     true,
-				IsBootstrap: n.IsBoostrap,
-				P2PKeyBundle: &nodev1.OCR2Config_P2PKeyBundle{
-					PeerId: n.Keys.PeerID.String(),
-				},
-				OcrKeyBundle: &nodev1.OCR2Config_OCRKeyBundle{
-					BundleId:              n.Keys.OCRKeyBundle.ID(),
-					ConfigPublicKey:       common.Bytes2Hex(cpk[:]),
-					OffchainPublicKey:     common.Bytes2Hex(offpk[:]),
-					OnchainSigningAddress: n.Keys.OCRKeyBundle.OnChainPublicKey(),
-				},
-				Multiaddr:        n.Addr.String(),
-				Plugins:          nil,
-				ForwarderAddress: "",
-			},
-		})
-	}
-
-	// TODO: I think we can pull it from the feeds manager.
-	return &nodev1.ListNodeChainConfigsResponse{
-		ChainConfigs: chainConfigs,
-	}, nil
-}
-
-func (j JobClient) GetJob(ctx context.Context, in *jobv1.GetJobRequest, opts ...grpc.CallOption) (*jobv1.GetJobResponse, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (j JobClient) GetProposal(ctx context.Context, in *jobv1.GetProposalRequest, opts ...grpc.CallOption) (*jobv1.GetProposalResponse, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (j JobClient) ListJobs(ctx context.Context, in *jobv1.ListJobsRequest, opts ...grpc.CallOption) (*jobv1.ListJobsResponse, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (j JobClient) ListProposals(ctx context.Context, in *jobv1.ListProposalsRequest, opts ...grpc.CallOption) (*jobv1.ListProposalsResponse, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (j JobClient) ProposeJob(ctx context.Context, in *jobv1.ProposeJobRequest, opts ...grpc.CallOption) (*jobv1.ProposeJobResponse, error) {
-	n := j.Nodes[in.NodeId]
-	// TODO: Use FMS
-	jb, err := validate.ValidatedCCIPSpec(in.Spec)
-	if err != nil {
-		return nil, err
-	}
-	err = n.App.AddJobV2(ctx, &jb)
-	if err != nil {
-		return nil, err
-	}
-	return &jobv1.ProposeJobResponse{Proposal: &jobv1.Proposal{
-		Id:      "",
-		Version: 0,
-		// Auto approve for now
-		Status:             jobv1.ProposalStatus_PROPOSAL_STATUS_APPROVED,
-		DeliveryStatus:     jobv1.ProposalDeliveryStatus_PROPOSAL_DELIVERY_STATUS_DELIVERED,
-		Spec:               in.Spec,
-		JobId:              jb.ExternalJobID.String(),
-		CreatedAt:          nil,
-		UpdatedAt:          nil,
-		AckedAt:            nil,
-		ResponseReceivedAt: nil,
-	}}, nil
-}
-
-func (j JobClient) RevokeJob(ctx context.Context, in *jobv1.RevokeJobRequest, opts ...grpc.CallOption) (*jobv1.RevokeJobResponse, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (j JobClient) DeleteJob(ctx context.Context, in *jobv1.DeleteJobRequest, opts ...grpc.CallOption) (*jobv1.DeleteJobResponse, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func NewMemoryJobClient(nodesByPeerID map[string]Node) *JobClient {
-	return &JobClient{nodesByPeerID}
-}
diff --git a/integration-tests/deployment/memory/node.go b/integration-tests/deployment/memory/node.go
deleted file mode 100644
index 7050cad53d..0000000000
--- a/integration-tests/deployment/memory/node.go
+++ /dev/null
@@ -1,291 +0,0 @@
-package memory
-
-import (
-	"context"
-	"fmt"
-	"math/big"
-	"net"
-	"net/http"
-	"strconv"
-	"testing"
-	"time"
-
-	"github.com/ethereum/go-ethereum/common"
-	gethtypes "github.com/ethereum/go-ethereum/core/types"
-	chainsel "github.com/smartcontractkit/chain-selectors"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap/zapcore"
-
-	"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/v2/core/chains/evm/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	v2toml "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
-	evmutils "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
-	configv2 "github.com/smartcontractkit/chainlink/v2/core/config/toml"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/logger/audit"
-	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/testutils/heavyweight"
-	"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
-	Keys       Keys
-	Addr       net.TCPAddr
-	IsBoostrap bool
-}
-
-func (n Node) ReplayLogs(chains map[uint64]uint64) error {
-	for sel, block := range chains {
-		chainID, _ := chainsel.ChainIdFromSelector(sel)
-		if err := n.App.ReplayFromBlock(big.NewInt(int64(chainID)), block, false); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-type RegistryConfig struct {
-	EVMChainID uint64
-	Contract   common.Address
-}
-
-// Creates a CL node which is:
-// - Configured for OCR
-// - Configured for the chains specified
-// - Transmitter keys funded.
-func NewNode(
-	t *testing.T,
-	port int, // Port for the P2P V2 listener.
-	chains map[uint64]EVMChain,
-	logLevel zapcore.Level,
-	bootstrap bool,
-	registryConfig RegistryConfig,
-) *Node {
-	// Do not want to load fixtures as they contain a dummy chainID.
-	// Create database and initial configuration.
-	cfg, db := heavyweight.FullTestDBNoFixturesV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-		c.Insecure.OCRDevelopmentMode = ptr(true) // Disables ocr spec validation so we can have fast polling for the test.
-
-		c.Feature.LogPoller = ptr(true)
-
-		// P2P V2 configs.
-		c.P2P.V2.Enabled = ptr(true)
-		c.P2P.V2.DeltaDial = config.MustNewDuration(500 * time.Millisecond)
-		c.P2P.V2.DeltaReconcile = config.MustNewDuration(5 * time.Second)
-		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", port)}
-
-		// Enable Capabilities, This is a pre-requisite for registrySyncer to work.
-		if registryConfig.Contract != common.HexToAddress("0x0") {
-			c.Capabilities.ExternalRegistry.NetworkID = ptr(relay.NetworkEVM)
-			c.Capabilities.ExternalRegistry.ChainID = ptr(strconv.FormatUint(uint64(registryConfig.EVMChainID), 10))
-			c.Capabilities.ExternalRegistry.Address = ptr(registryConfig.Contract.String())
-		}
-
-		// OCR configs
-		c.OCR.Enabled = ptr(false)
-		c.OCR.DefaultTransactionQueueDepth = ptr(uint32(200))
-		c.OCR2.Enabled = ptr(true)
-		c.OCR2.ContractPollInterval = config.MustNewDuration(5 * time.Second)
-
-		c.Log.Level = ptr(configv2.LogLevel(logLevel))
-
-		var chainConfigs v2toml.EVMConfigs
-		for chainID := range chains {
-			chainConfigs = append(chainConfigs, createConfigV2Chain(chainID))
-		}
-		c.EVM = chainConfigs
-	})
-
-	// Set logging.
-	lggr := logger.TestLogger(t)
-	lggr.SetLogLevel(logLevel)
-
-	// Create clients for the core node backed by sim.
-	clients := make(map[uint64]client.Client)
-	for chainID, chain := range chains {
-		clients[chainID] = client.NewSimulatedBackendClient(t, chain.Backend, big.NewInt(int64(chainID)))
-	}
-
-	// Create keystore
-	master := keystore.New(db, utils.FastScryptParams, lggr)
-	kStore := KeystoreSim{
-		eks: &EthKeystoreSim{
-			Eth: master.Eth(),
-		},
-		csa: master.CSA(),
-	}
-
-	// Build evm factory using clients + keystore.
-	mailMon := mailbox.NewMonitor("node", lggr.Named("mailbox"))
-	evmOpts := chainlink.EVMFactoryConfig{
-		ChainOpts: legacyevm.ChainOpts{
-			AppConfig: cfg,
-			GenEthClient: func(i *big.Int) client.Client {
-				ethClient, ok := clients[i.Uint64()]
-				if !ok {
-					t.Fatal("no backend for chainID", i)
-				}
-				return ethClient
-			},
-			MailMon: mailMon,
-			DS:      db,
-		},
-		CSAETHKeystore: kStore,
-	}
-
-	// Build relayer factory with EVM.
-	relayerFactory := chainlink.RelayerFactory{
-		Logger:       lggr,
-		LoopRegistry: plugins.NewLoopRegistry(lggr.Named("LoopRegistry"), cfg.Tracing()),
-		GRPCOpts:     loop.GRPCOpts{},
-	}
-	initOps := []chainlink.CoreRelayerChainInitFunc{chainlink.InitEVM(context.Background(), relayerFactory, evmOpts)}
-	rci, err := chainlink.NewCoreRelayerChainInteroperators(initOps...)
-	require.NoError(t, err)
-
-	app, err := chainlink.NewApplication(chainlink.ApplicationOpts{
-		Config:                     cfg,
-		DS:                         db,
-		KeyStore:                   master,
-		RelayerChainInteroperators: rci,
-		Logger:                     lggr,
-		ExternalInitiatorManager:   nil,
-		CloseLogger:                lggr.Sync,
-		UnrestrictedHTTPClient:     &http.Client{},
-		RestrictedHTTPClient:       &http.Client{},
-		AuditLogger:                audit.NoopLogger,
-		MailMon:                    mailMon,
-		LoopRegistry:               plugins.NewLoopRegistry(lggr, cfg.Tracing()),
-	})
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		require.NoError(t, db.Close())
-	})
-	keys := CreateKeys(t, app, chains)
-
-	return &Node{
-		App:        app,
-		Keys:       keys,
-		Addr:       net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: port},
-		IsBoostrap: bootstrap,
-	}
-}
-
-type Keys struct {
-	PeerID                   p2pkey.PeerID
-	TransmittersByEVMChainID map[uint64]common.Address
-	OCRKeyBundle             ocr2key.KeyBundle
-}
-
-func CreateKeys(t *testing.T,
-	app chainlink.Application, chains map[uint64]EVMChain) Keys {
-	ctx := Context(t)
-	require.NoError(t, app.GetKeyStore().Unlock(ctx, "password"))
-	_, err := app.GetKeyStore().P2P().Create(ctx)
-	require.NoError(t, err)
-
-	p2pIDs, err := app.GetKeyStore().P2P().GetAll()
-	require.NoError(t, err)
-	require.Len(t, p2pIDs, 1)
-	peerID := p2pIDs[0].PeerID()
-	// create a transmitter for each chain
-	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)
-		require.NoError(t, err2)
-		if len(addrs) == 1 {
-			// just fund the address
-			fundAddress(t, chain.DeployerKey, addrs[0], assets.Ether(10).ToInt(), chain.Backend)
-			transmitters[chainID] = addrs[0]
-		} else {
-			// create key and fund it
-			_, err3 := app.GetKeyStore().Eth().Create(Context(t), cid)
-			require.NoError(t, err3, "failed to create key for chain", chainID)
-			sendingKeys, err3 := app.GetKeyStore().Eth().EnabledAddressesForChain(Context(t), cid)
-			require.NoError(t, err3)
-			require.Len(t, sendingKeys, 1)
-			fundAddress(t, chain.DeployerKey, sendingKeys[0], assets.Ether(10).ToInt(), chain.Backend)
-			transmitters[chainID] = sendingKeys[0]
-		}
-	}
-	require.Len(t, transmitters, len(chains))
-
-	keybundle, err := app.GetKeyStore().OCR2().Create(ctx, chaintype.EVM)
-	require.NoError(t, err)
-	return Keys{
-		PeerID:                   peerID,
-		TransmittersByEVMChainID: transmitters,
-		OCRKeyBundle:             keybundle,
-	}
-}
-
-func createConfigV2Chain(chainID uint64) *v2toml.EVMConfig {
-	chainIDBig := evmutils.NewI(int64(chainID))
-	chain := v2toml.Defaults(chainIDBig)
-	chain.GasEstimator.LimitDefault = ptr(uint64(5e6))
-	chain.LogPollInterval = config.MustNewDuration(1000 * time.Millisecond)
-	chain.Transactions.ForwardersEnabled = ptr(false)
-	chain.FinalityDepth = ptr(uint32(2))
-	return &v2toml.EVMConfig{
-		ChainID: chainIDBig,
-		Enabled: ptr(true),
-		Chain:   chain,
-		Nodes:   v2toml.EVMNodes{&v2toml.Node{}},
-	}
-}
-
-func ptr[T any](v T) *T { return &v }
-
-var _ keystore.Eth = &EthKeystoreSim{}
-
-type EthKeystoreSim struct {
-	keystore.Eth
-}
-
-// override
-func (e *EthKeystoreSim) SignTx(ctx context.Context, address common.Address, tx *gethtypes.Transaction, chainID *big.Int) (*gethtypes.Transaction, error) {
-	// always sign with chain id 1337 for the simulated backend
-	return e.Eth.SignTx(ctx, address, tx, big.NewInt(1337))
-}
-
-type KeystoreSim struct {
-	eks keystore.Eth
-	csa keystore.CSA
-}
-
-func (e KeystoreSim) Eth() keystore.Eth {
-	return e.eks
-}
-
-func (e KeystoreSim) CSA() keystore.CSA {
-	return e.csa
-}
diff --git a/integration-tests/deployment/memory/node_test.go b/integration-tests/deployment/memory/node_test.go
deleted file mode 100644
index d64c7717fc..0000000000
--- a/integration-tests/deployment/memory/node_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package memory
-
-import (
-	"testing"
-
-	"github.com/hashicorp/consul/sdk/freeport"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap/zapcore"
-)
-
-func TestNode(t *testing.T) {
-	chains := GenerateChains(t, 3)
-	ports := freeport.GetN(t, 1)
-	node := NewNode(t, ports[0], chains, zapcore.DebugLevel, false, RegistryConfig{})
-	// We expect 3 transmitter keys
-	keys, err := node.App.GetKeyStore().Eth().GetAll(Context(t))
-	require.NoError(t, err)
-	require.Len(t, keys, 3)
-	// We expect 3 chains supported
-	evmChains := node.App.GetRelayers().LegacyEVMChains().Slice()
-	require.NoError(t, err)
-	require.Len(t, evmChains, 3)
-}
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 7abf19dc82..8eed200342 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -19,7 +19,6 @@ require (
 	github.com/go-resty/resty/v2 v2.11.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
-	github.com/hashicorp/consul/sdk v0.16.0
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/lib/pq v1.10.9
 	github.com/manifoldco/promptui v0.9.0
@@ -33,18 +32,16 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/shopspring/decimal v1.4.0
 	github.com/slack-go/slack v0.12.2
-	github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240808195812-ae0378684685
-	github.com/smartcontractkit/chain-selectors v1.0.21
+	github.com/smartcontractkit/chain-selectors v1.0.23
 	github.com/smartcontractkit/chainlink-automation v1.0.4
-	github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f
 	github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834
-	github.com/smartcontractkit/chainlink-testing-framework v1.33.0
+	github.com/smartcontractkit/chainlink-testing-framework v1.34.5
 	github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239
 	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/havoc/k8schaos v0.0.0-20240409145249-e78d20847e37
 	github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7
-	github.com/smartcontractkit/seth v1.0.12
+	github.com/smartcontractkit/seth v1.1.1
 	github.com/smartcontractkit/wasp v0.4.5
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.9.0
@@ -58,12 +55,9 @@ require (
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/sync v0.8.0
 	golang.org/x/text v0.17.0
-	google.golang.org/grpc v1.65.0
-	google.golang.org/protobuf v1.34.2
 	gopkg.in/guregu/null.v4 v4.0.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
-	gotest.tools/v3 v3.5.1
 	k8s.io/apimachinery v0.28.2
 )
 
@@ -108,6 +102,7 @@ require (
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/avast/retry-go v3.0.0+incompatible // indirect
+	github.com/awalterschulze/gographviz v2.0.3+incompatible // indirect
 	github.com/aws/aws-sdk-go v1.45.25 // indirect
 	github.com/aws/constructs-go/constructs/v10 v10.1.255 // indirect
 	github.com/aws/jsii-runtime-go v1.75.0 // indirect
@@ -257,7 +252,7 @@ require (
 	github.com/grafana/loki v1.6.2-0.20231215164305-b51b7d7b5503 // indirect
 	github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 // indirect
 	github.com/grafana/pyroscope-go v1.1.1 // indirect
-	github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
+	github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
 	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -269,6 +264,7 @@ require (
 	github.com/gtank/merlin v0.1.1 // indirect
 	github.com/gtank/ristretto255 v0.1.2 // indirect
 	github.com/hashicorp/consul/api v1.28.2 // indirect
+	github.com/hashicorp/consul/sdk v0.16.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-envparse v0.1.0 // indirect
@@ -313,7 +309,7 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/klauspost/compress v1.17.7 // indirect
+	github.com/klauspost/compress v1.17.8 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
@@ -474,6 +470,8 @@ require (
 	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect
+	google.golang.org/grpc v1.65.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index babc3fc8c6..d7ec061aeb 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -204,6 +204,8 @@ github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHS
 github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/avast/retry-go/v4 v4.6.0 h1:K9xNA+KeB8HHc2aWFuLb25Offp+0iVRXEvFx8IinRJA=
 github.com/avast/retry-go/v4 v4.6.0/go.mod h1:gvWlPhBVsvBbLkVGDg/KwvBv0bEkCOLRRSHKIr2PyOE=
+github.com/awalterschulze/gographviz v2.0.3+incompatible h1:9sVEXJBJLwGX7EQVhLm2elIKCm7P2YHFC8v6096G09E=
+github.com/awalterschulze/gographviz v2.0.3+incompatible/go.mod h1:GEV5wmg4YquNw7v1kkyoX9etIk8yVmXj+AkDHuuETHs=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
@@ -804,8 +806,8 @@ github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 h1:wQ0FnSeeb
 github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4/go.mod h1:f3JSoxBTPXX5ec4FxxeC19nTBSxoTz+cBgS3cYLMcr0=
 github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ=
 github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww=
 github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
 github.com/graph-gophers/dataloader v5.0.0+incompatible h1:R+yjsbrNq1Mo3aPG+Z/EKYrXrXXUNJHOgbRt+U6jOug=
@@ -1032,9 +1034,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
+github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
 github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
@@ -1388,14 +1389,10 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ=
 github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
-github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240808195812-ae0378684685 h1:jakAsdhDxV4cMgRAcSvHraXjyePi8umG5SEUTGFvuy8=
-github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240808195812-ae0378684685/go.mod h1:p7L/xNEQpHDdZtgFA6/FavuZHqvV3kYhQysxBywmq1k=
-github.com/smartcontractkit/chain-selectors v1.0.21 h1:KCR9SA7PhOexaBzFieHoLv1WonwhVOPtOStpqTmLC4E=
-github.com/smartcontractkit/chain-selectors v1.0.21/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
+github.com/smartcontractkit/chain-selectors v1.0.23 h1:D2Eaex4Cw/O7Lg3tX6WklOqnjjIQAEBnutCtksPzVDY=
+github.com/smartcontractkit/chain-selectors v1.0.23/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
-github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f h1:lQZBOjeYFpCdk0mGQUhbrJipd00tu49xK4zSijC/9Co=
-github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f/go.mod h1:/ZWraCBaDDgaIN1prixYcbVvIk/6HeED9+8zbWQ+TMo=
 github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834 h1:pTf4xdcmiWBqWZ6rTy2RMTDBzhHk89VC1pM7jXKQztI=
 github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834/go.mod h1:fh9eBbrReCmv31bfz52ENCAMa7nTKQbdhb2B3+S2VGo=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 h1:NBQLtqk8zsyY4qTJs+NElI3aDFTcAo83JHvqD04EvB0=
@@ -1408,8 +1405,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240712132946-267a37c5ac6
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240712132946-267a37c5ac6e/go.mod h1:hsFhop+SlQHKD+DEFjZrMJmbauT1A/wvtZIeeo4PxFU=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 h1:HyLTySm7BR+oNfZqDTkVJ25wnmcTtxBBD31UkFL+kEM=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
-github.com/smartcontractkit/chainlink-testing-framework v1.33.0 h1:vHQODEdsq5AIbRiyZZ30de6uwJUNFXLYvCr+Odr8TIs=
-github.com/smartcontractkit/chainlink-testing-framework v1.33.0/go.mod h1:GrhHthZ5AmceF82+Ypw6Fov1EvB05JJbb1T0EKyO1x0=
+github.com/smartcontractkit/chainlink-testing-framework v1.34.5 h1:6itLSDW4NHDDNR+Y+Z8YDzxxCN9SjdKb6SmLCl0vTFM=
+github.com/smartcontractkit/chainlink-testing-framework v1.34.5/go.mod h1:hRZEDh2+afO8MSZb9qYNscmWb+3mHZf01J5ACZuIdTQ=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 h1:Kk5OVlx/5g9q3Z3lhxytZS4/f8ds1MiNM8yaHgK3Oe8=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU=
 github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16 h1:TFe+FvzxClblt6qRfqEhUfa4kFQx5UobuoFGO2W4mMo=
@@ -1420,8 +1417,8 @@ github.com/smartcontractkit/havoc/k8schaos v0.0.0-20240409145249-e78d20847e37 h1
 github.com/smartcontractkit/havoc/k8schaos v0.0.0-20240409145249-e78d20847e37/go.mod h1:/kFr0D7SI/vueXl1N03uzOun4nViGPFRyA5X6eL3jXw=
 github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7 h1:e38V5FYE7DA1JfKXeD5Buo/7lczALuVXlJ8YNTAUxcw=
 github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7/go.mod h1:fb1ZDVXACvu4frX3APHZaEBp0xi1DIm34DcA0CwTsZM=
-github.com/smartcontractkit/seth v1.0.12 h1:iVdgMx42XWanPPnBaM5StR4c1XsTr/0/B/kKRZL5BsY=
-github.com/smartcontractkit/seth v1.0.12/go.mod h1:thWtbLyW4nRHJGzC5heknQDORoJPErE15sF34LHkorg=
+github.com/smartcontractkit/seth v1.1.1 h1:6hvexjJD7ek8ht/CLlEwQcH21K2E/WEYwbSRdKInZmM=
+github.com/smartcontractkit/seth v1.1.1/go.mod h1:cDfKHi/hJLpO9sRpVbrflrHCOV+MJPAMJHloExJnIXk=
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE=
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg=
 github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ=
@@ -2171,6 +2168,7 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
 gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod
index a90826f599..c8ef675d05 100644
--- a/integration-tests/load/go.mod
+++ b/integration-tests/load/go.mod
@@ -17,11 +17,11 @@ require (
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.4
 	github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834
-	github.com/smartcontractkit/chainlink-testing-framework v1.33.0
+	github.com/smartcontractkit/chainlink-testing-framework v1.34.5
 	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240214231432-4ad5eb95178c
 	github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240216210048-da02459ddad8
 	github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7
-	github.com/smartcontractkit/seth v1.0.12
+	github.com/smartcontractkit/seth v1.1.1
 	github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1
 	github.com/smartcontractkit/wasp v0.4.7
 	github.com/stretchr/testify v1.9.0
@@ -35,13 +35,13 @@ require (
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
 	cosmossdk.io/errors v1.0.1 // indirect
 	cosmossdk.io/math v1.3.0 // indirect
+	github.com/awalterschulze/gographviz v2.0.3+incompatible // indirect
 	github.com/containerd/errdefs v0.1.0 // indirect
 	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 // indirect
 	github.com/testcontainers/testcontainers-go v0.28.0 // indirect
 	k8s.io/apimachinery v0.30.2 // indirect
@@ -233,7 +233,7 @@ require (
 	github.com/grafana/loki v1.6.2-0.20231215164305-b51b7d7b5503 // indirect
 	github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 // indirect
 	github.com/grafana/pyroscope-go v1.1.1 // indirect
-	github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
+	github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
 	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -290,7 +290,7 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/klauspost/compress v1.17.7 // indirect
+	github.com/klauspost/compress v1.17.8 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
@@ -374,7 +374,7 @@ require (
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/smartcontractkit/chain-selectors v1.0.21 // indirect
+	github.com/smartcontractkit/chain-selectors v1.0.23 // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240718160222-2dc0c8136bfa // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827 // indirect
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240712132946-267a37c5ac6e // indirect
diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum
index 536b96f8b6..714ba7700b 100644
--- a/integration-tests/load/go.sum
+++ b/integration-tests/load/go.sum
@@ -192,6 +192,8 @@ github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHS
 github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/avast/retry-go/v4 v4.6.0 h1:K9xNA+KeB8HHc2aWFuLb25Offp+0iVRXEvFx8IinRJA=
 github.com/avast/retry-go/v4 v4.6.0/go.mod h1:gvWlPhBVsvBbLkVGDg/KwvBv0bEkCOLRRSHKIr2PyOE=
+github.com/awalterschulze/gographviz v2.0.3+incompatible h1:9sVEXJBJLwGX7EQVhLm2elIKCm7P2YHFC8v6096G09E=
+github.com/awalterschulze/gographviz v2.0.3+incompatible/go.mod h1:GEV5wmg4YquNw7v1kkyoX9etIk8yVmXj+AkDHuuETHs=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
@@ -778,8 +780,8 @@ github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 h1:wQ0FnSeeb
 github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4/go.mod h1:f3JSoxBTPXX5ec4FxxeC19nTBSxoTz+cBgS3cYLMcr0=
 github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ=
 github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww=
 github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
 github.com/graph-gophers/dataloader v5.0.0+incompatible h1:R+yjsbrNq1Mo3aPG+Z/EKYrXrXXUNJHOgbRt+U6jOug=
@@ -1004,9 +1006,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
+github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
 github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
@@ -1354,12 +1355,10 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ=
 github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
-github.com/smartcontractkit/chain-selectors v1.0.21 h1:KCR9SA7PhOexaBzFieHoLv1WonwhVOPtOStpqTmLC4E=
-github.com/smartcontractkit/chain-selectors v1.0.21/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
+github.com/smartcontractkit/chain-selectors v1.0.23 h1:D2Eaex4Cw/O7Lg3tX6WklOqnjjIQAEBnutCtksPzVDY=
+github.com/smartcontractkit/chain-selectors v1.0.23/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
-github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f h1:lQZBOjeYFpCdk0mGQUhbrJipd00tu49xK4zSijC/9Co=
-github.com/smartcontractkit/chainlink-ccip v0.0.0-20240816163757-48726fd8165f/go.mod h1:/ZWraCBaDDgaIN1prixYcbVvIk/6HeED9+8zbWQ+TMo=
 github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834 h1:pTf4xdcmiWBqWZ6rTy2RMTDBzhHk89VC1pM7jXKQztI=
 github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834/go.mod h1:fh9eBbrReCmv31bfz52ENCAMa7nTKQbdhb2B3+S2VGo=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 h1:NBQLtqk8zsyY4qTJs+NElI3aDFTcAo83JHvqD04EvB0=
@@ -1372,8 +1371,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240712132946-267a37c5ac6
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240712132946-267a37c5ac6e/go.mod h1:hsFhop+SlQHKD+DEFjZrMJmbauT1A/wvtZIeeo4PxFU=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 h1:HyLTySm7BR+oNfZqDTkVJ25wnmcTtxBBD31UkFL+kEM=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
-github.com/smartcontractkit/chainlink-testing-framework v1.33.0 h1:vHQODEdsq5AIbRiyZZ30de6uwJUNFXLYvCr+Odr8TIs=
-github.com/smartcontractkit/chainlink-testing-framework v1.33.0/go.mod h1:GrhHthZ5AmceF82+Ypw6Fov1EvB05JJbb1T0EKyO1x0=
+github.com/smartcontractkit/chainlink-testing-framework v1.34.5 h1:6itLSDW4NHDDNR+Y+Z8YDzxxCN9SjdKb6SmLCl0vTFM=
+github.com/smartcontractkit/chainlink-testing-framework v1.34.5/go.mod h1:hRZEDh2+afO8MSZb9qYNscmWb+3mHZf01J5ACZuIdTQ=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 h1:Kk5OVlx/5g9q3Z3lhxytZS4/f8ds1MiNM8yaHgK3Oe8=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU=
 github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16 h1:TFe+FvzxClblt6qRfqEhUfa4kFQx5UobuoFGO2W4mMo=
@@ -1384,8 +1383,8 @@ github.com/smartcontractkit/havoc/k8schaos v0.0.0-20240409145249-e78d20847e37 h1
 github.com/smartcontractkit/havoc/k8schaos v0.0.0-20240409145249-e78d20847e37/go.mod h1:/kFr0D7SI/vueXl1N03uzOun4nViGPFRyA5X6eL3jXw=
 github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7 h1:e38V5FYE7DA1JfKXeD5Buo/7lczALuVXlJ8YNTAUxcw=
 github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7/go.mod h1:fb1ZDVXACvu4frX3APHZaEBp0xi1DIm34DcA0CwTsZM=
-github.com/smartcontractkit/seth v1.0.12 h1:iVdgMx42XWanPPnBaM5StR4c1XsTr/0/B/kKRZL5BsY=
-github.com/smartcontractkit/seth v1.0.12/go.mod h1:thWtbLyW4nRHJGzC5heknQDORoJPErE15sF34LHkorg=
+github.com/smartcontractkit/seth v1.1.1 h1:6hvexjJD7ek8ht/CLlEwQcH21K2E/WEYwbSRdKInZmM=
+github.com/smartcontractkit/seth v1.1.1/go.mod h1:cDfKHi/hJLpO9sRpVbrflrHCOV+MJPAMJHloExJnIXk=
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE=
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg=
 github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ=
diff --git a/integration-tests/testsetups/ocr.go b/integration-tests/testsetups/ocr.go
index 45c334bf69..30b0a6fcb1 100644
--- a/integration-tests/testsetups/ocr.go
+++ b/integration-tests/testsetups/ocr.go
@@ -277,8 +277,7 @@ func (o *OCRSoakTest) Setup(ocrTestConfig tt.OcrTestConfig) {
 	nodes, err := client.ConnectChainlinkNodes(o.testEnvironment)
 	require.NoError(o.t, err, "Connecting to chainlink nodes shouldn't fail")
 	o.bootstrapNode, o.workerNodes = nodes[0], nodes[1:]
-	o.mockServer, err = ctf_client.ConnectMockServer(o.testEnvironment)
-	require.NoError(o.t, err, "Creating mockserver clients shouldn't fail")
+	o.mockServer = ctf_client.ConnectMockServer(o.testEnvironment)
 
 	linkContract, err := contracts.DeployLinkTokenContract(o.log, sethClient)
 	require.NoError(o.t, err, "Error deploying LINK contract")
@@ -546,12 +545,9 @@ func (o *OCRSoakTest) LoadState() error {
 		}
 	}
 
-	o.mockServer, err = ctf_client.ConnectMockServerURL(testState.MockServerURL)
-	if err != nil {
-		return err
-	}
+	o.mockServer = ctf_client.ConnectMockServerURL(testState.MockServerURL)
 
-	return err
+	return nil
 }
 
 func (o *OCRSoakTest) Resume() {
diff --git a/integration-tests/web/sdk/client/client.go b/integration-tests/web/sdk/client/client.go
index bf0bf49f1b..e13a02aa5a 100644
--- a/integration-tests/web/sdk/client/client.go
+++ b/integration-tests/web/sdk/client/client.go
@@ -48,12 +48,12 @@ type Credentials struct {
 }
 
 func New(baseURI string, creds Credentials) (Client, error) {
-	e := endpoints{
+	ep := endpoints{
 		Sessions: baseURI + "/sessions",
 		Query:    baseURI + "/query",
 	}
 	c := &client{
-		endpoints:   e,
+		endpoints:   ep,
 		credentials: creds,
 	}
 
diff --git a/tools/bin/go_core_ccip_deployment_tests b/tools/bin/go_core_ccip_deployment_tests
deleted file mode 100755
index 54f9b70d26..0000000000
--- a/tools/bin/go_core_ccip_deployment_tests
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-set -o pipefail
-set +e
-
-SCRIPT_PATH=`dirname "$0"`; SCRIPT_PATH=`eval "cd \"$SCRIPT_PATH\" && pwd"`
-OUTPUT_FILE="../output.txt"
-USE_TEE="${USE_TEE:-true}"
-
-# To allow reuse in CI from other repositories
-TOOLS_PATH=${TOOLS_PATH:-"./tools"}
-
-echo "Failed tests and panics: ---------------------"
-echo ""
-use_tee() {
-  if [ "$USE_TEE" = "true" ]; then
-    tee "$@"
-  else
-    cat > "$@"
-  fi
-}
-
-cd ./integration-tests || exit
-go mod download
-go test -json ./deployment/... -covermode=atomic -coverpkg=./... -coverprofile=coverage.txt | use_tee $OUTPUT_FILE
-EXITCODE=${PIPESTATUS[0]}
-
-# Assert no known sensitive strings present in test logger output
-printf "\n----------------------------------------------\n\n"
-echo "Beginning check of output logs for sensitive strings"
-$SCRIPT_PATH/scrub_logs $OUTPUT_FILE
-cd ..
-if [[ $? != 0 ]]; then
-  exit 1
-fi
-
-echo "Exit code: $EXITCODE"
-if [[ $EXITCODE != 0 ]]; then
-  echo "Encountered test failures."
-else
-  echo "All tests passed!"
-fi
-echo "go_core_ccip_deployment_tests exiting with code $EXITCODE"
-exit $EXITCODE
diff --git a/tools/ci/ccip_lcov_prune b/tools/ci/ccip_lcov_prune
index 0c6355f626..494b2d526c 100755
--- a/tools/ci/ccip_lcov_prune
+++ b/tools/ci/ccip_lcov_prune
@@ -27,4 +27,4 @@ lcov --remove $1 -o $2 \
   'src/v0.8/tests/MockV3Aggregator.sol' \
   'src/v0.8/ccip/applications/CCIPClientExample.sol' \
   'src/v0.8/ccip/pools/BurnWithFromMintTokenPool.sol' \
-  --rc lcov_branch_coverage=1
+  --rc lcov_branch_coverage=1
\ No newline at end of file